diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2010-05-27 15:13:32 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-07-27 12:01:08 -0500 |
| commit | 76c46e4970f7ee6d8c54220a767e93d67b74cd33 (patch) | |
| tree | 9f5840afb6261cc66fbcb0d2510df6034de22973 /drivers/scsi/hpsa.c | |
| parent | b93d7536eaa1206ad4a00ad8ea700ff0bd75a0da (diff) | |
[SCSI] hpsa: factor out hpsa-CISS-signature-present
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/hpsa.c')
| -rw-r--r-- | drivers/scsi/hpsa.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index dcbe54b1dfb..f2a9af64dfa 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -3372,6 +3372,18 @@ 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')) { + dev_warn(&h->pdev->dev, "not a valid CISS config table\n"); + return false; + } + return true; +} + static int __devinit hpsa_pci_init(struct ctlr_info *h) { int i, prod_index, err; @@ -3415,11 +3427,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h) goto err_out_free_res; hpsa_find_board_params(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')) { - dev_warn(&h->pdev->dev, "not a valid CISS config table\n"); + if (!hpsa_CISS_signature_present(h)) { err = -ENODEV; goto err_out_free_res; } |