AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

PNP: change pnp_add_card_id() to allocate its own pnp_id structures

Browse Source 
This moves some of the pnp_id knowledge out of the backends and into
the PNP core.

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>
This commit is contained in:
Bjorn Helgaas 2008-04-28 16:33:56 -06:00 committed by Len Brown
parent 048825deea
commit e436675f2a
3 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pnp/base.h
View File

@ -4,7 +4,7 @@ void *pnp_alloc(long size);
void pnp_eisa_id_to_string(u32 id, char *str); 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_dev *pnp_alloc_dev(struct pnp_protocol *, int id, char *pnpid);
struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id); struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id);
int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card); struct pnp_id *pnp_add_card_id(struct pnp_card *card, char *id);
int pnp_interface_attach_device(struct pnp_dev *dev); int pnp_interface_attach_device(struct pnp_dev *dev);
void pnp_fixup_device(struct pnp_dev *dev); void pnp_fixup_device(struct pnp_dev *dev);
void pnp_free_option(struct pnp_option *option); void pnp_free_option(struct pnp_option *option);

27
drivers/pnp/card.c
View File

@ -5,6 +5,7 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/ctype.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pnp.h> #include <linux/pnp.h>
#include "base.h" #include "base.h"
@ -100,19 +101,33 @@ static int card_probe(struct pnp_card *card, struct pnp_card_driver *drv)
* @id: pointer to a pnp_id structure * @id: pointer to a pnp_id structure
* @card: pointer to the desired card * @card: pointer to the desired card
*/ */
int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card) struct pnp_id *pnp_add_card_id(struct pnp_card *card, char *id)
{ {
struct pnp_id *ptr; struct pnp_id *dev_id, *ptr;
id->next = NULL; dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
if (!dev_id)
return NULL;
dev_id->id[0] = id[0];
dev_id->id[1] = id[1];
dev_id->id[2] = id[2];
dev_id->id[3] = tolower(id[3]);
dev_id->id[4] = tolower(id[4]);
dev_id->id[5] = tolower(id[5]);
dev_id->id[6] = tolower(id[6]);
dev_id->id[7] = '\0';
dev_id->next = NULL;
ptr = card->id; ptr = card->id;
while (ptr && ptr->next) while (ptr && ptr->next)
ptr = ptr->next; ptr = ptr->next;
if (ptr) if (ptr)
ptr->next = id; ptr->next = dev_id;
else else
card->id = id; card->id = dev_id;
return 0;
return dev_id;
} }
static void pnp_free_card_ids(struct pnp_card *card) static void pnp_free_card_ids(struct pnp_card *card)

21
drivers/pnp/isapnp/core.c
View File

@ -822,17 +822,18 @@ static unsigned char __init isapnp_checksum(unsigned char *data)
static void isapnp_parse_card_id(struct pnp_card *card, unsigned short vendor, static void isapnp_parse_card_id(struct pnp_card *card, unsigned short vendor,
unsigned short device) unsigned short device)
{ {
struct pnp_id *id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL); char id[8];
if (!id) id[0] = 'A' + ((vendor >> 2) & 0x3f) - 1;
return; id[1] = 'A' + (((vendor & 3) << 3) | ((vendor >> 13) & 7)) - 1;
sprintf(id->id, "%c%c%c%x%x%x%x", id[2] = 'A' + ((vendor >> 8) & 0x1f) - 1;
'A' + ((vendor >> 2) & 0x3f) - 1, id[3] = hex_asc((device >> 4) & 0x0f);
'A' + (((vendor & 3) << 3) | ((vendor >> 13) & 7)) - 1, id[4] = hex_asc(device & 0x0f);
'A' + ((vendor >> 8) & 0x1f) - 1, id[5] = hex_asc((device >> 12) & 0x0f);
(device >> 4) & 0x0f, id[6] = hex_asc((device >> 8) & 0x0f);
device & 0x0f, (device >> 12) & 0x0f, (device >> 8) & 0x0f); id[7] = '\0';
pnp_add_card_id(id, card);
pnp_add_card_id(card, id);
} }
/* /*