Commit 0fc9fd40 authored by Akinobu Mita's avatar Akinobu Mita Committed by James Bottomley

[SCSI] hpsa: use check_signature

Use check_signature to find a signature in the mmio address.
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Acked-by: default avatarMike Miller <mike.miller@hp.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 71552505
...@@ -408,6 +408,7 @@ config BLK_DEV_3W_XXXX_RAID ...@@ -408,6 +408,7 @@ config BLK_DEV_3W_XXXX_RAID
config SCSI_HPSA config SCSI_HPSA
tristate "HP Smart Array SCSI driver" tristate "HP Smart Array SCSI driver"
depends on PCI && SCSI depends on PCI && SCSI
select CHECK_SIGNATURE
help help
This driver supports HP Smart Array Controllers (circa 2009). This driver supports HP Smart Array Controllers (circa 2009).
It is a SCSI alternative to the cciss driver, which is a block It is a SCSI alternative to the cciss driver, which is a block
......
...@@ -3842,10 +3842,7 @@ static void __devinit hpsa_find_board_params(struct ctlr_info *h) ...@@ -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) static inline bool hpsa_CISS_signature_present(struct ctlr_info *h)
{ {
if ((readb(&h->cfgtable->Signature[0]) != 'C') || if (!check_signature(h->cfgtable->Signature, "CISS", 4)) {
(readb(&h->cfgtable->Signature[1]) != 'I') ||
(readb(&h->cfgtable->Signature[2]) != 'S') ||
(readb(&h->cfgtable->Signature[3]) != 'S')) {
dev_warn(&h->pdev->dev, "not a valid CISS config table\n"); dev_warn(&h->pdev->dev, "not a valid CISS config table\n");
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment