hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: unisys: Fix logical continuation checks in virthba.c 

This patch fixes checkpatch checks where the logical operator should be at the
end of the line above, not beginning the next line.

Signed-off-by: Ken Depro <kenneth.depro@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ken Depro 2015-01-20 10:01:09 -05:00 committed by Greg Kroah-Hartman
parent 836600fa95
commit 45104bf993
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/staging/unisys/virthba/virthba.c
View File

@ -430,8 +430,8 @@ virthba_ISR(int irq, void *dev_id)
virthbainfo->interrupts_rcvd++; virthbainfo->interrupts_rcvd++;
pChannelHeader = virthbainfo->chinfo.queueinfo->chan; pChannelHeader = virthbainfo->chinfo.queueinfo->chan;
if (((readq(&pChannelHeader->features) if (((readq(&pChannelHeader->features)
& ULTRA_IO_IOVM_IS_OK_WITH_DRIVER_DISABLING_INTS) != 0) & ULTRA_IO_IOVM_IS_OK_WITH_DRIVER_DISABLING_INTS) != 0) &&
&& ((readq(&pChannelHeader->features) & ((readq(&pChannelHeader->features) &
ULTRA_IO_DRIVER_DISABLES_INTS) != ULTRA_IO_DRIVER_DISABLES_INTS) !=
0)) { 0)) {
virthbainfo->interrupts_disabled++; virthbainfo->interrupts_disabled++;
@ -808,9 +808,9 @@ virthba_abort_handler(struct scsi_cmnd *scsicmd)
scsidev = scsicmd->device; scsidev = scsicmd->device;
for (vdisk = &((struct virthba_info *)scsidev->host->hostdata)->head; for (vdisk = &((struct virthba_info *)scsidev->host->hostdata)->head;
vdisk->next; vdisk = vdisk->next) { vdisk->next; vdisk = vdisk->next) {
if ((scsidev->channel == vdisk->channel) if ((scsidev->channel == vdisk->channel) &&
&& (scsidev->id == vdisk->id) (scsidev->id == vdisk->id) &&
&& (scsidev->lun == vdisk->lun)) { (scsidev->lun == vdisk->lun)) {
if (atomic_read(&vdisk->error_count) < if (atomic_read(&vdisk->error_count) <
VIRTHBA_ERROR_COUNT) { VIRTHBA_ERROR_COUNT) {
atomic_inc(&vdisk->error_count); atomic_inc(&vdisk->error_count);
@ -834,9 +834,9 @@ virthba_bus_reset_handler(struct scsi_cmnd *scsicmd)
scsidev = scsicmd->device; scsidev = scsicmd->device;
for (vdisk = &((struct virthba_info *)scsidev->host->hostdata)->head; for (vdisk = &((struct virthba_info *)scsidev->host->hostdata)->head;
vdisk->next; vdisk = vdisk->next) { vdisk->next; vdisk = vdisk->next) {
if ((scsidev->channel == vdisk->channel) if ((scsidev->channel == vdisk->channel) &&
&& (scsidev->id == vdisk->id) (scsidev->id == vdisk->id) &&
&& (scsidev->lun == vdisk->lun)) { (scsidev->lun == vdisk->lun)) {
if (atomic_read(&vdisk->error_count) < if (atomic_read(&vdisk->error_count) <
VIRTHBA_ERROR_COUNT) { VIRTHBA_ERROR_COUNT) {
atomic_inc(&vdisk->error_count); atomic_inc(&vdisk->error_count);
@ -860,9 +860,9 @@ virthba_device_reset_handler(struct scsi_cmnd *scsicmd)
scsidev = scsicmd->device; scsidev = scsicmd->device;
for (vdisk = &((struct virthba_info *)scsidev->host->hostdata)->head; for (vdisk = &((struct virthba_info *)scsidev->host->hostdata)->head;
vdisk->next; vdisk = vdisk->next) { vdisk->next; vdisk = vdisk->next) {
if ((scsidev->channel == vdisk->channel) if ((scsidev->channel == vdisk->channel) &&
&& (scsidev->id == vdisk->id) (scsidev->id == vdisk->id) &&
&& (scsidev->lun == vdisk->lun)) { (scsidev->lun == vdisk->lun)) {
if (atomic_read(&vdisk->error_count) < if (atomic_read(&vdisk->error_count) <
VIRTHBA_ERROR_COUNT) { VIRTHBA_ERROR_COUNT) {
atomic_inc(&vdisk->error_count); atomic_inc(&vdisk->error_count);
@ -1132,9 +1132,9 @@ do_scsi_linuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd)
/* Okay see what our error_count is here.... */ /* Okay see what our error_count is here.... */
for (vdisk = &((struct virthba_info *)scsidev->host->hostdata)->head; for (vdisk = &((struct virthba_info *)scsidev->host->hostdata)->head;
vdisk->next; vdisk = vdisk->next) { vdisk->next; vdisk = vdisk->next) {
if ((scsidev->channel != vdisk->channel) if ((scsidev->channel != vdisk->channel) ||
|| (scsidev->id != vdisk->id) (scsidev->id != vdisk->id) ||
|| (scsidev->lun != vdisk->lun)) (scsidev->lun != vdisk->lun))
continue; continue;
if (atomic_read(&vdisk->error_count) < VIRTHBA_ERROR_COUNT) { if (atomic_read(&vdisk->error_count) < VIRTHBA_ERROR_COUNT) {
@ -1170,8 +1170,8 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd)
struct virtdisk_info *vdisk; struct virtdisk_info *vdisk;
scsidev = scsicmd->device; scsidev = scsicmd->device;
if ((cmdrsp->scsi.cmnd[0] == INQUIRY) if ((cmdrsp->scsi.cmnd[0] == INQUIRY) &&
&& (cmdrsp->scsi.bufflen >= MIN_INQUIRY_RESULT_LEN)) { (cmdrsp->scsi.bufflen >= MIN_INQUIRY_RESULT_LEN)) {
if (cmdrsp->scsi.no_disk_result == 0) if (cmdrsp->scsi.no_disk_result == 0)
return; return;
@ -1211,9 +1211,9 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd)
vdisk = &((struct virthba_info *)scsidev->host->hostdata)->head; vdisk = &((struct virthba_info *)scsidev->host->hostdata)->head;
for ( ; vdisk->next; vdisk = vdisk->next) { for ( ; vdisk->next; vdisk = vdisk->next) {
if ((scsidev->channel != vdisk->channel) if ((scsidev->channel != vdisk->channel) ||
|| (scsidev->id != vdisk->id) (scsidev->id != vdisk->id) ||
|| (scsidev->lun != vdisk->lun)) (scsidev->lun != vdisk->lun))
continue; continue;
if (atomic_read(&vdisk->ios_threshold) > 0) { if (atomic_read(&vdisk->ios_threshold) > 0) {