PnP changes to allow MODULE_DEVICE_TABLE()
Subsystems (2)
PATCH 1/1 PnP changes to allow MODULE_DEVICE_TABLE()
hello adam, jaroslav, list
this patch does:
- rename struct pnp_card_id to pnp_card_device_id
- fix all references to it
this is needed for the MODULE_DEVICE_TABLE() macro to work with pnp_card's. jaroslav did this a while ago (changeset 1.879.79.1), but adam undid it a bit later (changeset 1.889.202.3). but why?
w/o the patch gcc dies when compiling als100.c with the message 'storage size of __mod_pnp_card_device_table unknown' (this is from the macro).
any reasons why i should not send this to linus?
against 2.5.65-bk
rgds
-daniel
===== drivers/isdn/hisax/hisax_fcpcipnp.c 1.15 vs edited =====
drivers/isdn/hisax/hisax_fcpcipnp.c +2 -2
@@ -909,7 +909,7 @@#ifdef CONFIG_PNP_CARD static int __devinit fcpnp_probe (struct pnp_card *card, -const struct pnp_card_id *card_id) +const struct pnp_card_device_id *card_id) {struct fritz_adapter *adapter;struct pnp_dev *pnp_dev;
@@ -955,7 +955,7 @@delete_adapter (adapter); } -static struct pnp_card_id fcpnp_ids[]__devinitdata = { +static struct pnp_card_device_id fcpnp_ids[]__devinitdata = { { .id ="AVM0900" , .driver_data = (unsigned long )"Fritz!Card PnP" , .devs = { {"AVM0900" } },
===== drivers/pnp/card.c 1.10 vs edited =====
drivers/pnp/card.c +3 -3
@@ -21,9 +21,9 @@LIST_HEAD (pnp_cards); -static const struct pnp_card_id *match_card (struct pnp_card_driver * drv,struct pnp_card * card) +static const struct pnp_card_device_id *match_card (struct pnp_card_driver * drv,struct pnp_card * card) { -const struct pnp_card_id * drv_id = drv->id_table; +const struct pnp_card_device_id * drv_id = drv->id_table;while (*drv_id->id){if (compare_pnp_id (card->id,drv_id->id))return drv_id;
@@ -274,7 +274,7 @@list_for_each_safe (pos,temp,&pnp_cards){ struct pnp_card *card = list_entry(pos, struct pnp_card, global_list); -const struct pnp_card_id *id =match_card (drv,card); +const struct pnp_card_device_id *id =match_card (drv,card);if (id) {struct pnp_card_link * clink =pnp_alloc (sizeof (struct pnp_card_link ));if (!clink)
===== include/linux/pnp.h 1.17 vs edited =====
include/linux/pnp.h +3 -3
@@ -295,7 +295,7 @@unsigned long driver_data;/* data private to the driver */ }; -struct pnp_card_id { +struct pnp_card_device_id {char id[PNP_ID_LEN ];unsigned long driver_data;/* data private to the driver */ struct {
@@ -316,9 +316,9 @@struct pnp_card_driver {char * name; -const struct pnp_card_id *id_table; +const struct pnp_card_device_id *id_table;unsigned int flags; -int (*probe) (struct pnp_card_link *card,const struct pnp_card_id *card_id); +int (*probe) (struct pnp_card_link *card,const struct pnp_card_device_id *card_id);void (*remove) (struct pnp_card_link *card);struct pnp_driver link; };
===== sound/isa/als100.c 1.9 vs edited =====
sound/isa/als100.c +4 -4
@@ -98,7 +98,7 @@struct pnp_dev *devopl; }; -static struct pnp_card_id snd_als100_pnpids[]__devinitdata = { +static struct pnp_card_device_id snd_als100_pnpids[]__devinitdata = {/* ALS100 - PRO16PNP */ { .id ="ALS0001" , .devs = { {"@@@0001" }, {"@X@0001" }, {"@H@0001" }, } },/* ALS110 - MF1000 - Digimate 3D Sound */
@@ -118,7 +118,7 @@static int __devinit snd_card_als100_isapnp (int dev,struct snd_card_als100 *acard,struct pnp_card_link *card, -const struct pnp_card_id *id) +const struct pnp_card_device_id *id) {struct pnp_dev *pdev;struct pnp_resource_table * cfg =kmalloc (GFP_ATOMIC ,sizeof (struct pnp_resource_table ));
@@ -209,7 +210,7 @@static int __init snd_card_als100_probe (int dev,struct pnp_card_link *pcard, -const struct pnp_card_id *pid) +const struct pnp_card_device_id *pid) {int error;sb_t *chip;
@@ -287,7 +288,7 @@ }static int __devinit snd_als100_pnp_detect (struct pnp_card_link *card, -const struct pnp_card_id *id) +const struct pnp_card_device_id *id) {static int dev;int res;
===== sound/isa/sb/es968.c 1.9 vs edited =====
sound/isa/sb/es968.c +4 -4
@@ -69,7 +69,7 @@struct pnp_dev *dev; }; -static struct pnp_card_id snd_es968_pnpids[]__devinitdata = { +static struct pnp_card_device_id snd_es968_pnpids[]__devinitdata = { { .id ="ESS0968" , .devs = { {"@@@0968" }, } }, { .id ="" , }/* end */ };
@@ -92,7 +92,7 @@static int __devinit snd_card_es968_isapnp (int dev,struct snd_card_es968 *acard,struct pnp_card_link *card, -const struct pnp_card_id *id) +const struct pnp_card_device_id *id) {struct pnp_dev *pdev;struct pnp_resource_table * cfg =kmalloc (GFP_ATOMIC ,sizeof (struct pnp_resource_table ));
@@ -133,7 +133,7 @@static int __init snd_card_es968_probe (int dev,struct pnp_card_link *pcard, -const struct pnp_card_id *pid) +const struct pnp_card_device_id *pid) {int error;sb_t *chip;
@@ -188,7 +188,7 @@ }static int __devinit snd_es968_pnp_detect (struct pnp_card_link *card, -const struct pnp_card_id *id) +const struct pnp_card_device_id *id) {static int dev;int res;
===== sound/oss/sb_card.c 1.17 vs edited =====
sound/oss/sb_card.c +1 -1
@@ -224,7 +224,7 @@ }/* Probe callback function for the PnP API */ -static int sb_pnp_probe (struct pnp_card_link *card,const struct pnp_card_id *card_id) +static int sb_pnp_probe (struct pnp_card_link *card,const struct pnp_card_device_id *card_id) {struct sb_card_config *scc;struct sb_module_options sbmo = {0 };/* Default to 0 for PnP */
===== sound/oss/sb_card.h 1.2 vs edited =====
sound/oss/sb_card.h +1 -1
@@ -23,7 +23,7 @@*/ /* Card PnP ID Table */ -static struct pnp_card_id sb_pnp_card_table[] = { +static struct pnp_card_device_id sb_pnp_card_table[] = {/* Sound Blaster 16 */ {.id ="CTL0024" , .driver_data =0 , devs : { {.id="CTL0031" }, } },/* Sound Blaster 16 */
Quoted 10 lines · Daniel Ritz
hello adam, jaroslav, list
this patch does:
- rename structpnp_card_idtopnp_card_device_id
- fix all references to itthis is needed for the
MODULE_DEVICE_TABLE()macro to work with pnp_card's. jaroslav did this a while ago (changeset 1.879.79.1), but adam undid it a bit later (changeset 1.889.202.3). but why?
Quoted 9 lines
w/o the patch gcc dies when compiling
als100.cwith the message 'storage size of__mod_pnp_card_device_tableunknown' (this is from the macro).any reasons why i should not send this to linus?
against 2.5.65-bkrgds
-daniel
That change was accidentally lost during a merge. Thanks for this patch, it looks good and I added it to my changes for 2.5.66.
Regards,
Adam