[PATCH 04/10] staging: unisys: fix all logical continuation virthba

[Erik Arfvidson]

This patch fixes all logical continuations issues in virthba.c

Signed-off-by: Erik Arfvidson <erik.arfvid...@unisys.com>
---
 drivers/staging/unisys/virthba/virthba.c | 42 ++++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/drivers/staging/unisys/virthba/virthba.c 
b/drivers/staging/unisys/virthba/virthba.c
index 6c0ee48..73a7307 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -431,10 +431,10 @@ virthba_ISR(int irq, void *dev_id)
        virthbainfo->interrupts_rcvd++;
        pChannelHeader = virthbainfo->chinfo.queueinfo->chan;
        if (((readq(&pChannelHeader->Features)
-             & ULTRA_IO_IOVM_IS_OK_WITH_DRIVER_DISABLING_INTS) != 0)
-           && ((readq(&pChannelHeader->Features) &
-                ULTRA_IO_DRIVER_DISABLES_INTS) !=
-               0)) {
+             &ULTRA_IO_IOVM_IS_OK_WITH_DRIVER_DISABLING_INTS) != 0) &
+           ((readq(&pChannelHeader->Features) &
+             ULTRA_IO_DRIVER_DISABLES_INTS) !=
+            0)) {
                virthbainfo->interrupts_disabled++;
                mask = ~ULTRA_CHANNEL_ENABLE_INTS;
                rc1 = uisqueue_interlocked_and(virthbainfo->flags_addr, mask);
@@ -808,9 +808,9 @@ virthba_abort_handler(struct scsi_cmnd *scsicmd)
        scsidev = scsicmd->device;
        for (vdisk = &((struct virthba_info *)scsidev->host->hostdata)->head;
             vdisk->next; vdisk = vdisk->next) {
-               if ((scsidev->channel == vdisk->channel)
-                   && (scsidev->id == vdisk->id)
-                   && (scsidev->lun == vdisk->lun)) {
+               if ((scsidev->channel == vdisk->channel) &&
+                   (scsidev->id == vdisk->id) &&
+                   (scsidev->lun == vdisk->lun)) {
                        if (atomic_read(&vdisk->error_count) <
                            VIRTHBA_ERROR_COUNT) {
                                atomic_inc(&vdisk->error_count);
@@ -834,9 +834,9 @@ virthba_bus_reset_handler(struct scsi_cmnd *scsicmd)
        scsidev = scsicmd->device;
        for (vdisk = &((struct virthba_info *)scsidev->host->hostdata)->head;
             vdisk->next; vdisk = vdisk->next) {
-               if ((scsidev->channel == vdisk->channel)
-                   && (scsidev->id == vdisk->id)
-                   && (scsidev->lun == vdisk->lun)) {
+               if ((scsidev->channel == vdisk->channel) &&
+                   (scsidev->id == vdisk->id) &&
+                   (scsidev->lun == vdisk->lun)) {
                        if (atomic_read(&vdisk->error_count) <
                            VIRTHBA_ERROR_COUNT) {
                                atomic_inc(&vdisk->error_count);
@@ -860,9 +860,9 @@ virthba_device_reset_handler(struct scsi_cmnd *scsicmd)
        scsidev = scsicmd->device;
        for (vdisk = &((struct virthba_info *)scsidev->host->hostdata)->head;
             vdisk->next; vdisk = vdisk->next) {
-               if ((scsidev->channel == vdisk->channel)
-                   && (scsidev->id == vdisk->id)
-                   && (scsidev->lun == vdisk->lun)) {
+               if ((scsidev->channel == vdisk->channel) &&
+                   (scsidev->id == vdisk->id) &&
+                   (scsidev->lun == vdisk->lun)) {
                        if (atomic_read(&vdisk->error_count) <
                            VIRTHBA_ERROR_COUNT) {
                                atomic_inc(&vdisk->error_count);
@@ -1131,9 +1131,9 @@ do_scsi_linuxstat(struct uiscmdrsp *cmdrsp, struct 
scsi_cmnd *scsicmd)
        /* Okay see what our error_count is here.... */
        for (vdisk = &((struct virthba_info *)scsidev->host->hostdata)->head;
             vdisk->next; vdisk = vdisk->next) {
-               if ((scsidev->channel != vdisk->channel)
-                   || (scsidev->id != vdisk->id)
-                   || (scsidev->lun != vdisk->lun))
+               if ((scsidev->channel != vdisk->channel) ||
+                   (scsidev->id != vdisk->id) ||
+                   (scsidev->lun != vdisk->lun))
                        continue;
 
                if (atomic_read(&vdisk->error_count) < VIRTHBA_ERROR_COUNT) {
@@ -1169,8 +1169,8 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct 
scsi_cmnd *scsicmd)
        struct virtdisk_info *vdisk;
 
        scsidev = scsicmd->device;
-       if ((cmdrsp->scsi.cmnd[0] == INQUIRY)
-           && (cmdrsp->scsi.bufflen >= MIN_INQUIRY_RESULT_LEN)) {
+       if ((cmdrsp->scsi.cmnd[0] == INQUIRY) &&
+           (cmdrsp->scsi.bufflen >= MIN_INQUIRY_RESULT_LEN)) {
                if (cmdrsp->scsi.no_disk_result == 0)
                        return;
 
@@ -1209,9 +1209,9 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct 
scsi_cmnd *scsicmd)
        } else {
                vdisk = &((struct virthba_info *)scsidev->host->hostdata)->head;
                for ( ; vdisk->next; vdisk = vdisk->next) {
-                       if ((scsidev->channel != vdisk->channel)
-                           || (scsidev->id != vdisk->id)
-                           || (scsidev->lun != vdisk->lun))
+                       if ((scsidev->channel != vdisk->channel) ||
+                               (scsidev->id != vdisk->id) ||
+                               (scsidev->lun != vdisk->lun))
                                continue;
 
                        if (atomic_read(&vdisk->ios_threshold) > 0) {
-- 
1.9.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel