diff options
Diffstat (limited to 'drivers/staging/unisys/virthba/virthba.c')
| -rw-r--r-- | drivers/staging/unisys/virthba/virthba.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c index 049eeab08bac..938e2c82c1ab 100644 --- a/drivers/staging/unisys/virthba/virthba.c +++ b/drivers/staging/unisys/virthba/virthba.c @@ -436,7 +436,7 @@ virthba_ISR(int irq, void *dev_id) 0)) { virthbainfo->interrupts_disabled++; mask = ~ULTRA_CHANNEL_ENABLE_INTS; - rc1 = uisqueue_InterlockedAnd(virthbainfo->flags_addr, mask); + rc1 = uisqueue_interlocked_and(virthbainfo->flags_addr, mask); } if (visor_signalqueue_empty(pChannelHeader, IOCHAN_FROM_IOPART)) { virthbainfo->interrupts_notme++; @@ -517,7 +517,7 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct pci_device_id *id) (unsigned short) (virtpcidev->scsi.max.max_io_size / PAGE_SIZE); if (scsihost->sg_tablesize > MAX_PHYS_INFO) scsihost->sg_tablesize = MAX_PHYS_INFO; - LOGINF("scsihost->max_channel=%u, max_id=%u, max_lun=%u, cmd_per_lun=%u, max_sectors=%hu, sg_tablesize=%hu\n", + LOGINF("scsihost->max_channel=%u, max_id=%u, max_lun=%llu, cmd_per_lun=%u, max_sectors=%hu, sg_tablesize=%hu\n", scsihost->max_channel, scsihost->max_id, scsihost->max_lun, scsihost->cmd_per_lun, scsihost->max_sectors, scsihost->sg_tablesize); @@ -627,9 +627,9 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct pci_device_id *id) virthbainfo->interrupt_vector); mask = ~(ULTRA_IO_CHANNEL_IS_POLLING | ULTRA_IO_DRIVER_DISABLES_INTS); - uisqueue_InterlockedAnd(Features_addr, mask); + uisqueue_interlocked_and(Features_addr, mask); mask = ULTRA_IO_DRIVER_ENABLES_INTS; - uisqueue_InterlockedOr(Features_addr, mask); + uisqueue_interlocked_or(Features_addr, mask); rsltq_wait_usecs = 4000000; } @@ -746,7 +746,7 @@ forward_taskmgmt_command(TASK_MGMT_TYPES tasktype, struct scsi_device *scsidev) int notifyresult = 0xffff; wait_queue_head_t notifyevent; - LOGINF("TaskMgmt:%d %d:%d:%d\n", tasktype, + LOGINF("TaskMgmt:%d %d:%d:%llu\n", tasktype, scsidev->channel, scsidev->id, scsidev->lun); if (virthbainfo->serverdown || virthbainfo->serverchangingstate) { @@ -1105,7 +1105,6 @@ virthba_slave_destroy(struct scsi_device *scsidev) return; } } - return; } /*****************************************************/ @@ -1139,7 +1138,7 @@ do_scsi_linuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd) if (atomic_read(&vdisk->error_count) < VIRTHBA_ERROR_COUNT) { atomic_inc(&vdisk->error_count); - LOGERR("SCSICMD ****FAILED scsicmd:0x%p op:0x%x <%d:%d:%d:%d> 0x%x-0x%x-0x%x-0x%x-0x%x.\n", + LOGERR("SCSICMD ****FAILED scsicmd:0x%p op:0x%x <%d:%d:%d:%llu> 0x%x-0x%x-0x%x-0x%x-0x%x.\n", scsicmd, cmdrsp->scsi.cmnd[0], scsidev->host->host_no, scsidev->id, scsidev->channel, scsidev->lun, @@ -1148,7 +1147,7 @@ do_scsi_linuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd) sd->AdditionalSenseCodeQualifier); if (atomic_read(&vdisk->error_count) == VIRTHBA_ERROR_COUNT) { - LOGERR("Throtling SCSICMD errors disk <%d:%d:%d:%d>\n", + LOGERR("Throtling SCSICMD errors disk <%d:%d:%d:%llu>\n", scsidev->host->host_no, scsidev->id, scsidev->channel, scsidev->lun); } @@ -1354,7 +1353,7 @@ process_incoming_rsps(void *v) atomic_set(&virthbainfo->interrupt_rcvd, 0); /* drain queue */ drain_queue(virthbainfo, dc, cmdrsp); - rc1 = uisqueue_InterlockedOr(virthbainfo->flags_addr, mask); + rc1 = uisqueue_interlocked_or(virthbainfo->flags_addr, mask); if (dc->threadinfo.should_stop) break; } @@ -1458,16 +1457,16 @@ static ssize_t enable_ints_write(struct file *file, if (new_value == 1) { mask = ~(ULTRA_IO_CHANNEL_IS_POLLING | ULTRA_IO_DRIVER_DISABLES_INTS); - uisqueue_InterlockedAnd(Features_addr, mask); + uisqueue_interlocked_and(Features_addr, mask); mask = ULTRA_IO_DRIVER_ENABLES_INTS; - uisqueue_InterlockedOr(Features_addr, mask); + uisqueue_interlocked_or(Features_addr, mask); rsltq_wait_usecs = 4000000; } else { mask = ~(ULTRA_IO_DRIVER_ENABLES_INTS | ULTRA_IO_DRIVER_DISABLES_INTS); - uisqueue_InterlockedAnd(Features_addr, mask); + uisqueue_interlocked_and(Features_addr, mask); mask = ULTRA_IO_CHANNEL_IS_POLLING; - uisqueue_InterlockedOr(Features_addr, mask); + uisqueue_interlocked_or(Features_addr, mask); rsltq_wait_usecs = 4000; } } |