Re: [PATCH] PnP Changes for 2.5.66

Adam Belay
2003-03-26T03:22:41Z

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.985.1.95 -> 1.985.1.96
# sound/isa/als100.c 1.10 -> 1.11
# sound/isa/sb/es968.c 1.9 -> 1.10
# sound/oss/sb_card.h 1.2 -> 1.3
# sound/oss/sb_card.c 1.17 -> 1.18
# drivers/isdn/hisax/hisax_fcpcipnp.c 1.15 -> 1.16
# drivers/pnp/card.c 1.11 -> 1.12
# include/linux/pnp.h 1.18 -> 1.19
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/03/25 ambx1@neo.rr.com 1.985.1.96
# [PATCH 2.5] PnP changes to allow MODULE_DEVICE_TABLE()
#
# This patch fixes the MODULE_DEVICE_TABLE problems, the correct code was
# accidentally lost a few merges back. It is from Daniel Ritz
# <daniel.ritz@gmx.ch>, below is the original message.
#
# 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
# --------------------------------------------
#
diff -Nru a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c Tue Mar 25 21:44:55 2003
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c Tue Mar 25 21:44:55 2003
@@ -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" } },
diff -Nru a/drivers/pnp/card.c b/drivers/pnp/card.c
--- a/drivers/pnp/card.c Tue Mar 25 21:44:55 2003
+++ b/drivers/pnp/card.c Tue Mar 25 21:44:55 2003
@@ -22,9 +22,9 @@
LIST_HEAD(pnp_card_drivers);

-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;
@@ -52,7 +52,7 @@

static int card_probe(struct pnp_card * card, struct pnp_card_driver * drv)
{
- 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)
diff -Nru a/include/linux/pnp.h b/include/linux/pnp.h
--- a/include/linux/pnp.h Tue Mar 25 21:44:55 2003
+++ b/include/linux/pnp.h Tue Mar 25 21:44:55 2003
@@ -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 {
@@ -317,9 +317,9 @@
struct pnp_card_driver {
struct list_head global_list;
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;
};
diff -Nru a/sound/isa/als100.c b/sound/isa/als100.c
--- a/sound/isa/als100.c Tue Mar 25 21:44:55 2003
+++ b/sound/isa/als100.c Tue Mar 25 21:44:55 2003
@@ -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));
@@ -210,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;
@@ -288,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;
diff -Nru a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c
--- a/sound/isa/sb/es968.c Tue Mar 25 21:44:55 2003
+++ b/sound/isa/sb/es968.c Tue Mar 25 21:44:55 2003
@@ -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;
diff -Nru a/sound/oss/sb_card.c b/sound/oss/sb_card.c
--- a/sound/oss/sb_card.c Tue Mar 25 21:44:55 2003
+++ b/sound/oss/sb_card.c Tue Mar 25 21:44:55 2003
@@ -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 */
diff -Nru a/sound/oss/sb_card.h b/sound/oss/sb_card.h
--- a/sound/oss/sb_card.h Tue Mar 25 21:44:55 2003
+++ b/sound/oss/sb_card.h Tue Mar 25 21:44:55 2003
@@ -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 */