diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2014-05-29 10:53:49 -0500 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-06-02 09:54:59 +0200 |
| commit | 8645291b8d1bac28efb803e768e91f24c814679c (patch) | |
| tree | 7bd4eeef3bd1b982be1d47cb650d6d0f25d4f1eb /drivers/scsi/hpsa.c | |
| parent | 7b2c46ee7259c52cf2c1f82ab100e9aaeb83f78a (diff) | |
| download | op-kernel-dev-8645291b8d1bac28efb803e768e91f24c814679c.zip op-kernel-dev-8645291b8d1bac28efb803e768e91f24c814679c.tar.gz | |
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>
Diffstat (limited to 'drivers/scsi/hpsa.c')
| -rw-r--r-- | drivers/scsi/hpsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 538b8c6..836c6c0 100644 --- 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; |
