提交 501b92cd 编写于 作者: S Stephen M. Cameron 提交者: Jens Axboe

cciss: factor out CISS_signature_present()

cciss: factor out CISS_signature_present()
Signed-off-by: NStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: NJens Axboe <jaxboe@fusionio.com>
上级 afadbf4b
...@@ -4096,6 +4096,18 @@ static void __devinit cciss_find_board_params(ctlr_info_t *h) ...@@ -4096,6 +4096,18 @@ static void __devinit cciss_find_board_params(ctlr_info_t *h)
} }
} }
static inline bool CISS_signature_present(ctlr_info_t *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 cciss_pci_init(ctlr_info_t *c) static int __devinit cciss_pci_init(ctlr_info_t *c)
{ {
int prod_index, err; int prod_index, err;
...@@ -4153,11 +4165,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c) ...@@ -4153,11 +4165,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c)
#endif /* CCISS_DEBUG */ #endif /* CCISS_DEBUG */
cciss_find_board_params(c); cciss_find_board_params(c);
if ((readb(&c->cfgtable->Signature[0]) != 'C') || if (!CISS_signature_present(c)) {
(readb(&c->cfgtable->Signature[1]) != 'I') ||
(readb(&c->cfgtable->Signature[2]) != 'S') ||
(readb(&c->cfgtable->Signature[3]) != 'S')) {
printk("Does not appear to be a valid CISS config table\n");
err = -ENODEV; err = -ENODEV;
goto err_out_free_res; goto err_out_free_res;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册