diff options
| author | Jeff Garzik <jeff@garzik.org> | 2012-08-17 14:04:50 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2012-08-17 14:04:50 -0400 |
| commit | 3e451a495d6a529d9a01c487f272bb2c4241158f (patch) | |
| tree | eb9a67d169b36f216bab9c261fc3b5b8afee7c70 | |
| parent | 91895b786e631ab47b618c901231f22b5a44115b (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>
| -rw-r--r-- | drivers/ata/libata-scsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 8ec81ca8f65..86c2663e00e 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) if (unlikely(scmd->cmd_len < 10)) goto invalid_fld; scsi_10_lba_len(cdb, &block, &n_block); - if (unlikely(cdb[1] & (1 << 3))) + if (cdb[1] & (1 << 3)) tf_flags |= ATA_TFLAG_FUA; break; case READ_6: @@ -1675,7 +1675,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc) if (unlikely(scmd->cmd_len < 16)) goto invalid_fld; scsi_16_lba_len(cdb, &block, &n_block); - if (unlikely(cdb[1] & (1 << 3))) + if (cdb[1] & (1 << 3)) tf_flags |= ATA_TFLAG_FUA; break; default: |