aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2012-04-04 09:14:59 -0400
committerJames Bottomley <JBottomley@Parallels.com>2012-04-23 18:16:56 -0400
commit0fc9fd4016ae03b0f5da5d7156644755c94783c4 (patch)
tree49e77ef2b052017c345a31d12e8375b1ac666fcd /drivers/scsi
parent715525057423eeb6308d2c605ae9ec8325e43858 (diff)
[SCSI] hpsa: use check_signature
Use check_signature to find a signature in the mmio address. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Acked-by: Mike Miller <mike.miller@hp.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/Kconfig1
-rw-r--r--drivers/scsi/hpsa.c5
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 29684c8142b0..bea04e5d3b51 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -408,6 +408,7 @@ config BLK_DEV_3W_XXXX_RAID
408config SCSI_HPSA 408config SCSI_HPSA
409 tristate "HP Smart Array SCSI driver" 409 tristate "HP Smart Array SCSI driver"
410 depends on PCI && SCSI 410 depends on PCI && SCSI
411 select CHECK_SIGNATURE
411 help 412 help
412 This driver supports HP Smart Array Controllers (circa 2009). 413 This driver supports HP Smart Array Controllers (circa 2009).
413 It is a SCSI alternative to the cciss driver, which is a block 414 It is a SCSI alternative to the cciss driver, which is a block
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 500e20dd56ec..f49047478c94 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3842,10 +3842,7 @@ static void __devinit hpsa_find_board_params(struct ctlr_info *h)
3842 3842
3843static inline bool hpsa_CISS_signature_present(struct ctlr_info *h) 3843static inline bool hpsa_CISS_signature_present(struct ctlr_info *h)
3844{ 3844{
3845 if ((readb(&h->cfgtable->Signature[0]) != 'C') || 3845 if (!check_signature(h->cfgtable->Signature, "CISS", 4)) {
3846 (readb(&h->cfgtable->Signature[1]) != 'I') ||
3847 (readb(&h->cfgtable->Signature[2]) != 'S') ||
3848 (readb(&h->cfgtable->Signature[3]) != 'S')) {
3849 dev_warn(&h->pdev->dev, "not a valid CISS config table\n"); 3846 dev_warn(&h->pdev->dev, "not a valid CISS config table\n");
3850 return false; 3847 return false;
3851 } 3848 }