aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2012-08-17 14:04:50 -0400
committerJeff Garzik <jgarzik@redhat.com>2012-08-17 14:04:50 -0400
commit3e451a495d6a529d9a01c487f272bb2c4241158f (patch)
treeeb9a67d169b36f216bab9c261fc3b5b8afee7c70 /drivers/ata
parent91895b786e631ab47b618c901231f22b5a44115b (diff)
[libata] scsi: Remove unlikely() from FUA check
Some other unlikely() should probably be removed as well. A fresh look reveals an over-enthusiasm for unlikely() in libata-scsi.c. Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-scsi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 8ec81ca8f659..86c2663e00e6 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1655,7 +1655,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc)
1655 if (unlikely(scmd->cmd_len < 10)) 1655 if (unlikely(scmd->cmd_len < 10))
1656 goto invalid_fld; 1656 goto invalid_fld;
1657 scsi_10_lba_len(cdb, &block, &n_block); 1657 scsi_10_lba_len(cdb, &block, &n_block);
1658 if (unlikely(cdb[1] & (1 << 3))) 1658 if (cdb[1] & (1 << 3))
1659 tf_flags |= ATA_TFLAG_FUA; 1659 tf_flags |= ATA_TFLAG_FUA;
1660 break; 1660 break;
1661 case READ_6: 1661 case READ_6:
@@ -1675,7 +1675,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc)
1675 if (unlikely(scmd->cmd_len < 16)) 1675 if (unlikely(scmd->cmd_len < 16))
1676 goto invalid_fld; 1676 goto invalid_fld;
1677 scsi_16_lba_len(cdb, &block, &n_block); 1677 scsi_16_lba_len(cdb, &block, &n_block);
1678 if (unlikely(cdb[1] & (1 << 3))) 1678 if (cdb[1] & (1 << 3))
1679 tf_flags |= ATA_TFLAG_FUA; 1679 tf_flags |= ATA_TFLAG_FUA;
1680 break; 1680 break;
1681 default: 1681 default: