lkml.org 
[lkml]   [2010]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 11/26] cciss: factor out CISS_signature_present()
    From
    Date
    From: Stephen M. Cameron <scameron@beardog.cce.hp.com>

    cciss: factor out CISS_signature_present()

    Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
    ---
    drivers/block/cciss.c | 18 +++++++++++++-----
    1 files changed, 13 insertions(+), 5 deletions(-)

    diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
    index 97feb50..9a48695 100644
    --- a/drivers/block/cciss.c
    +++ b/drivers/block/cciss.c
    @@ -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)
    {
    int prod_index, err;
    @@ -4153,11 +4165,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c)
    #endif /* CCISS_DEBUG */
    cciss_find_board_params(c);

    - if ((readb(&c->cfgtable->Signature[0]) != '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");
    + if (!CISS_signature_present(c)) {
    err = -ENODEV;
    goto err_out_free_res;
    }


    \
     
     \ /
      Last update: 2010-07-19 20:43    [W:0.023 / U:2.104 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site