lkml.org 
[lkml]   [2008]   [Apr]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 11/55] PNP: add pnp_alloc_card()
    Add pnp_alloc_card() to allocate a struct pnp_card and fill in the
    protocol, instance number, and initial PNP ID. Now it is always
    valid to use dev_printk() on any pnp_card pointer.

    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Acked-By: Rene Herman <rene.herman@gmail.com>

    ---
    drivers/pnp/base.h | 1 +
    drivers/pnp/card.c | 28 +++++++++++++++++++++++++---
    drivers/pnp/isapnp/core.c | 11 ++++-------
    3 files changed, 30 insertions(+), 10 deletions(-)

    Index: work10/drivers/pnp/base.h
    ===================================================================
    --- work10.orig/drivers/pnp/base.h 2008-04-28 16:09:13.000000000 -0600
    +++ work10/drivers/pnp/base.h 2008-04-28 16:09:14.000000000 -0600
    @@ -3,6 +3,7 @@
    #define PNP_EISA_ID_MASK 0x7fffffff
    void pnp_eisa_id_to_string(u32 id, char *str);
    struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *, int id, char *pnpid);
    +struct pnp_card *pnp_alloc_card(struct pnp_protocol *, int id, char *pnpid);
    struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id);
    struct pnp_id *pnp_add_card_id(struct pnp_card *card, char *id);
    int pnp_interface_attach_device(struct pnp_dev *dev);
    Index: work10/drivers/pnp/card.c
    ===================================================================
    --- work10.orig/drivers/pnp/card.c 2008-04-28 16:09:13.000000000 -0600
    +++ work10/drivers/pnp/card.c 2008-04-28 16:09:14.000000000 -0600
    @@ -151,6 +151,31 @@
    kfree(card);
    }

    +struct pnp_card *pnp_alloc_card(struct pnp_protocol *protocol, int id, char *pnpid)
    +{
    + struct pnp_card *card;
    + struct pnp_id *dev_id;
    +
    + card = kzalloc(sizeof(struct pnp_card), GFP_KERNEL);
    + if (!card)
    + return NULL;
    +
    + card->protocol = protocol;
    + card->number = id;
    +
    + card->dev.parent = &card->protocol->dev;
    + sprintf(card->dev.bus_id, "%02x:%02x", card->protocol->number,
    + card->number);
    +
    + dev_id = pnp_add_card_id(card, pnpid);
    + if (!dev_id) {
    + kfree(card);
    + return NULL;
    + }
    +
    + return card;
    +}
    +
    static ssize_t pnp_show_card_name(struct device *dmdev,
    struct device_attribute *attr, char *buf)
    {
    @@ -206,9 +231,6 @@
    int error;
    struct list_head *pos, *temp;

    - sprintf(card->dev.bus_id, "%02x:%02x", card->protocol->number,
    - card->number);
    - card->dev.parent = &card->protocol->dev;
    card->dev.bus = NULL;
    card->dev.release = &pnp_release_card;
    error = device_register(&card->dev);
    Index: work10/drivers/pnp/isapnp/core.c
    ===================================================================
    --- work10.orig/drivers/pnp/isapnp/core.c 2008-04-28 16:09:14.000000000 -0600
    +++ work10/drivers/pnp/isapnp/core.c 2008-04-28 16:09:14.000000000 -0600
    @@ -840,16 +840,14 @@
    header[5], header[6], header[7], header[8]);
    printk(KERN_DEBUG "checksum = 0x%x\n", checksum);
    #endif
    - if ((card =
    - kzalloc(sizeof(struct pnp_card), GFP_KERNEL)) == NULL)
    - continue;
    -
    - card->number = csn;
    - INIT_LIST_HEAD(&card->devices);
    eisa_id = header[0] | header[1] << 8 |
    header[2] << 16 | header[3] << 24;
    pnp_eisa_id_to_string(eisa_id, id);
    - pnp_add_card_id(card, id);
    + card = pnp_alloc_card(&isapnp_protocol, csn, id);
    + if (!card)
    + continue;
    +
    + INIT_LIST_HEAD(&card->devices);
    card->serial =
    (header[7] << 24) | (header[6] << 16) | (header[5] << 8) |
    header[4];
    @@ -860,7 +858,6 @@
    "isapnp: checksum for device %i is not valid (0x%x)\n",
    csn, isapnp_checksum_value);
    card->checksum = isapnp_checksum_value;
    - card->protocol = &isapnp_protocol;

    pnp_add_card(card);
    }
    --


    \
     
     \ /
      Last update: 2008-04-29 00:57    [W:0.045 / U:0.044 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site