[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>

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 8ec81ca8f659076dfa0f123ed178200549c4e253..86c2663e00e612d025b118916c7ff1c90f5b1294 100644 (file)
--- 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: