Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45104bf9 authored by Ken Depro's avatar Ken Depro Committed by Greg Kroah-Hartman
Browse files

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: default avatarKen Depro <kenneth.depro@unisys.com>
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 836600fa

drivers/staging/unisys/virthba/virthba.c

+19 −19
Original line number Diff line number Diff line
@@ -430,8 +430,8 @@ 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_IOVM_IS_OK_WITH_DRIVER_DISABLING_INTS) != 0) &&

	     ((readq(&pChannelHeader->features) &

		 ULTRA_IO_DRIVER_DISABLES_INTS) !=

		0)) {

		virthbainfo->interrupts_disabled++;
@@ -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);
@@ -1132,9 +1132,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) {
@@ -1170,8 +1170,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;
@@ -1211,9 +1211,9 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd) 


		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) {