diff options
| author | Bjorn Helgaas | 2008-04-29 00:33:58 +0200 |
|---|---|---|
| committer | Len Brown | 2008-04-29 09:22:17 +0200 |
| commit | 6bf2aab24a5dc26bf8274c4b9dbbed8ca99ae82c (patch) | |
| tree | 910e6795cf929481cecb00fc5ebad43121beba56 /drivers/pnp/card.c | |
| parent | ISAPNP: pull pnp_add_card_id() out of isapnp_parse_card_id() (diff) | |
| download | kernel-qcow2-linux-6bf2aab24a5dc26bf8274c4b9dbbed8ca99ae82c.tar.gz kernel-qcow2-linux-6bf2aab24a5dc26bf8274c4b9dbbed8ca99ae82c.tar.xz kernel-qcow2-linux-6bf2aab24a5dc26bf8274c4b9dbbed8ca99ae82c.zip | |
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>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp/card.c')
| -rw-r--r-- | drivers/pnp/card.c | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c index d606a163b1d7..a762a4176736 100644 --- a/drivers/pnp/card.c +++ b/drivers/pnp/card.c @@ -151,6 +151,31 @@ static void pnp_release_card(struct device *dmdev) 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 pnp_add_card(struct pnp_card *card) 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); |