diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2012-04-04 15:14:59 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-04-24 00:16:56 +0200 |
| commit | 0fc9fd4016ae03b0f5da5d7156644755c94783c4 (patch) | |
| tree | 49e77ef2b052017c345a31d12e8375b1ac666fcd | |
| parent | [SCSI] aacraid: add an iounmap call to aac_src_ioremap (diff) | |
| download | linux-0fc9fd4016ae03b0f5da5d7156644755c94783c4.tar.xz linux-0fc9fd4016ae03b0f5da5d7156644755c94783c4.zip | |
[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>
| -rw-r--r-- | drivers/scsi/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/scsi/hpsa.c | 5 |
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 config SCSI_HPSA tristate "HP Smart Array SCSI driver" depends on PCI && SCSI + select CHECK_SIGNATURE help This driver supports HP Smart Array Controllers (circa 2009). 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) static inline bool hpsa_CISS_signature_present(struct ctlr_info *h) { - if ((readb(&h->cfgtable->Signature[0]) != 'C') || - (readb(&h->cfgtable->Signature[1]) != 'I') || - (readb(&h->cfgtable->Signature[2]) != 'S') || - (readb(&h->cfgtable->Signature[3]) != 'S')) { + if (!check_signature(h->cfgtable->Signature, "CISS", 4)) { dev_warn(&h->pdev->dev, "not a valid CISS config table\n"); return false; } |