hpsa: remove bad unlikely annotation from device list updating code

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Reviewed-by: Justin Lindley <justin.lindley@hp.com>
Reviewed-by: Mike Miller <michael.miller@canonical.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 538b8c68bb9586026301afe840edd6c050a37c25..836c6c013ee8d3cc7e28974d217df45fdd19f99f 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3067,7 +3067,7 @@ static void hpsa_update_scsi_devices(struct ctlr_info *h, int hostno)
                ndev_allocated++;
        }
 
-       if (unlikely(is_scsi_rev_5(h)))
+       if (is_scsi_rev_5(h))
                raid_ctlr_position = 0;
        else
                raid_ctlr_position = nphysicals + nlogicals;