Thread (6 messages) 6 messages, 2 authors, 2005-02-18
STALE7767d

[patch libata-dev-2.6 4/5] libata: minor style changes in ata_scsi_pass_thru

From: John W. Linville <hidden>
Date: 2005-02-18 20:08:51
Also in: lkml

Remove some curlies around single-line if statements.

Signed-off-by: John W. Linville <redacted>
---

 drivers/scsi/libata-scsi.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
--- sata-smart-2.6/drivers/scsi/libata-scsi.c.style	2005-02-17 16:50:03.907040725 -0500
+++ sata-smart-2.6/drivers/scsi/libata-scsi.c	2005-02-17 16:50:40.819113315 -0500
@@ -1713,9 +1713,8 @@ ata_scsi_pass_thru(struct ata_queued_cmd
 	struct ata_taskfile *tf = &(qc->tf);
 	struct scsi_cmnd *cmd = qc->scsicmd;
 
-	if ((tf->protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN) {
+	if ((tf->protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN)
 		return 1;
-	}
 
 	/*
 	 * 12 and 16 byte CDBs use different offsets to
@@ -1734,9 +1733,8 @@ ata_scsi_pass_thru(struct ata_queued_cmd
 			tf->hob_lbam = scsicmd[9];
 			tf->hob_lbah = scsicmd[11];
 			tf->flags |= ATA_TFLAG_LBA48 ;
-		} else {
+		} else
 			tf->flags &= ~ATA_TFLAG_LBA48 ;
-		}
 
 		/*
 		 * Always copy low byte, device and command registers.
@@ -1781,9 +1779,8 @@ ata_scsi_pass_thru(struct ata_queued_cmd
 	 */
 	tf->flags |= (ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE) ;
 
-	if (cmd->sc_data_direction == SCSI_DATA_WRITE) {
+	if (cmd->sc_data_direction == SCSI_DATA_WRITE)
 		tf->flags |= ATA_TFLAG_WRITE;
-	}
 
 	/*
 	 * Set transfer length.
-- 
John W. Linville
linville@tuxdriver.com
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help