FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"struct pci_device_id[]" -> "DEFINE_PCI_DEVICE_TABLE"

Browse Source 
2.6.25 added the DEFINE_PCI_DEVICE_TABLE macro to make sure that the
pci_device_id tables are put into the correct section in the binary.
Convert all the places where the tables were defined to use them.

This is linux-2.6 commit where the change went in along with the
rationale:  90a1ba0c5e39eeea278f263c28ae02166c5911c8

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Kinsey Moore <kmoore@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9584 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2011-01-03 18:26:24 +00:00
parent fdaa2d3f49
commit 25a8bb1abe
12 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/dahdi/pciradio.c
View File

@ -1850,7 +1850,7 @@ static void __devexit pciradio_remove_one(struct pci_dev *pdev)
} }
} }
static struct pci_device_id pciradio_pci_tbl[] = { static DEFINE_PCI_DEVICE_TABLE(pciradio_pci_tbl) = {
{ 0xe159, 0x0001, 0xe16b, PCI_ANY_ID, 0, 0, (unsigned long)"PCIRADIO" }, { 0xe159, 0x0001, 0xe16b, PCI_ANY_ID, 0, 0, (unsigned long)"PCIRADIO" },
{ 0 } { 0 }
}; };

2
drivers/dahdi/tor2-hw.h
View File

@ -108,7 +108,7 @@
#define PCI_VENDOR_ID_PLX 0x10b5 #define PCI_VENDOR_ID_PLX 0x10b5
#ifdef __KERNEL__ #ifdef __KERNEL__
static struct pci_device_id tor2_pci_ids[] = static DEFINE_PCI_DEVICE_TABLE(tor2_pci_ids) =
#else #else
#define PCI_ANY_ID -1 #define PCI_ANY_ID -1
static struct tor2_pci_id { static struct tor2_pci_id {

2
drivers/dahdi/wcb4xxp/base.c
View File

@ -3035,7 +3035,7 @@ static void __devexit b4xxp_remove(struct pci_dev *pdev)
return; return;
} }
static struct pci_device_id b4xx_ids[] __devinitdata = static DEFINE_PCI_DEVICE_TABLE(b4xx_ids) =
{ {
{ 0xd161, 0xb410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)&wcb4xxp }, { 0xd161, 0xb410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)&wcb4xxp },
{ 0x1397, 0x16b8, 0x1397, 0xb552, 0, 0, (unsigned long)&hfc8s }, { 0x1397, 0x16b8, 0x1397, 0xb552, 0, 0, (unsigned long)&hfc8s },

2
drivers/dahdi/wcfxo.c
View File

@ -1029,7 +1029,7 @@ static void __devexit wcfxo_remove_one(struct pci_dev *pdev)
} }
} }
static struct pci_device_id wcfxo_pci_tbl[] = { static DEFINE_PCI_DEVICE_TABLE(wcfxo_pci_tbl) = {
{ 0xe159, 0x0001, 0x8084, PCI_ANY_ID, 0, 0, (unsigned long) &generic }, { 0xe159, 0x0001, 0x8084, PCI_ANY_ID, 0, 0, (unsigned long) &generic },
{ 0xe159, 0x0001, 0x8085, PCI_ANY_ID, 0, 0, (unsigned long) &wcx101p }, { 0xe159, 0x0001, 0x8085, PCI_ANY_ID, 0, 0, (unsigned long) &wcx101p },
{ 0xe159, 0x0001, 0x8086, PCI_ANY_ID, 0, 0, (unsigned long) &generic }, { 0xe159, 0x0001, 0x8086, PCI_ANY_ID, 0, 0, (unsigned long) &generic },

2
drivers/dahdi/wct1xxp.c
View File

@ -1397,7 +1397,7 @@ static void __devexit t1xxp_remove_one(struct pci_dev *pdev)
} }
} }
static struct pci_device_id t1xxp_pci_tbl[] = { static DEFINE_PCI_DEVICE_TABLE(t1xxp_pci_tbl) = {
{ 0xe159, 0x0001, 0x6159, PCI_ANY_ID, 0, 0, (unsigned long) "Digium Wildcard T100P T1/PRI or E100P E1/PRA Board" }, { 0xe159, 0x0001, 0x6159, PCI_ANY_ID, 0, 0, (unsigned long) "Digium Wildcard T100P T1/PRI or E100P E1/PRA Board" },
{ 0 } { 0 }
}; };

2
drivers/dahdi/wct4xxp/base.c
View File

@ -4928,7 +4928,7 @@ static void __devexit t4_remove_one(struct pci_dev *pdev)
} }
static struct pci_device_id t4_pci_tbl[] __devinitdata = static DEFINE_PCI_DEVICE_TABLE(t4_pci_tbl) =
{ {
{ 0x10ee, 0x0314, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)&wct4xxp }, { 0x10ee, 0x0314, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)&wct4xxp },

2
drivers/dahdi/wctc4xxp/base.c
View File

@ -3711,7 +3711,7 @@ static void __devexit wctc4xxp_remove_one(struct pci_dev *pdev)
kfree(wc); kfree(wc);
} }
static struct pci_device_id wctc4xxp_pci_tbl[] = { static DEFINE_PCI_DEVICE_TABLE(wctc4xxp_pci_tbl) = {
{ 0xd161, 0x3400, PCI_ANY_ID, PCI_ANY_ID, { 0xd161, 0x3400, PCI_ANY_ID, PCI_ANY_ID,
0, 0, (unsigned long) &wctc400p }, /* Digium board */ 0, 0, (unsigned long) &wctc400p }, /* Digium board */
{ 0xd161, 0x8004, PCI_ANY_ID, PCI_ANY_ID, { 0xd161, 0x8004, PCI_ANY_ID, PCI_ANY_ID,

2
drivers/dahdi/wctdm.c
View File

@ -2744,7 +2744,7 @@ static void __devexit wctdm_remove_one(struct pci_dev *pdev)
} }
} }
static struct pci_device_id wctdm_pci_tbl[] = { static DEFINE_PCI_DEVICE_TABLE(wctdm_pci_tbl) = {
{ 0xe159, 0x0001, 0xa159, PCI_ANY_ID, 0, 0, (unsigned long) &wctdm }, { 0xe159, 0x0001, 0xa159, PCI_ANY_ID, 0, 0, (unsigned long) &wctdm },
{ 0xe159, 0x0001, 0xe159, PCI_ANY_ID, 0, 0, (unsigned long) &wctdm }, { 0xe159, 0x0001, 0xe159, PCI_ANY_ID, 0, 0, (unsigned long) &wctdm },
{ 0xe159, 0x0001, 0xb100, PCI_ANY_ID, 0, 0, (unsigned long) &wctdme }, { 0xe159, 0x0001, 0xb100, PCI_ANY_ID, 0, 0, (unsigned long) &wctdme },

2
drivers/dahdi/wctdm24xxp/base.c
View File

@ -5201,7 +5201,7 @@ static void __devexit wctdm_remove_one(struct pci_dev *pdev)
} }
} }
static struct pci_device_id wctdm_pci_tbl[] = { static DEFINE_PCI_DEVICE_TABLE(wctdm_pci_tbl) = {
{ 0xd161, 0x2400, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &wctdm2400 }, { 0xd161, 0x2400, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &wctdm2400 },
{ 0xd161, 0x0800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &wctdm800 }, { 0xd161, 0x0800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &wctdm800 },
{ 0xd161, 0x8002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &wcaex800 }, { 0xd161, 0x8002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &wcaex800 },

2
drivers/dahdi/wcte11xp.c
View File

@ -1579,7 +1579,7 @@ static void __devexit t1xxp_remove_one(struct pci_dev *pdev)
} }
} }
static struct pci_device_id t1xxp_pci_tbl[] = { static DEFINE_PCI_DEVICE_TABLE(t1xxp_pci_tbl) = {
{ 0xe159, 0x0001, 0x71fe, PCI_ANY_ID, 0, 0, (unsigned long) "Digium Wildcard TE110P T1/E1 Board" }, { 0xe159, 0x0001, 0x71fe, PCI_ANY_ID, 0, 0, (unsigned long) "Digium Wildcard TE110P T1/E1 Board" },
{ 0xe159, 0x0001, 0x79fe, PCI_ANY_ID, 0, 0, (unsigned long) "Digium Wildcard TE110P T1/E1 Board" }, { 0xe159, 0x0001, 0x79fe, PCI_ANY_ID, 0, 0, (unsigned long) "Digium Wildcard TE110P T1/E1 Board" },
{ 0xe159, 0x0001, 0x795e, PCI_ANY_ID, 0, 0, (unsigned long) "Digium Wildcard TE110P T1/E1 Board" }, { 0xe159, 0x0001, 0x795e, PCI_ANY_ID, 0, 0, (unsigned long) "Digium Wildcard TE110P T1/E1 Board" },

2
drivers/dahdi/wcte12xp/base.c
View File

@ -2379,7 +2379,7 @@ static void __devexit te12xp_remove_one(struct pci_dev *pdev)
free_wc(wc); free_wc(wc);
} }
static struct pci_device_id te12xp_pci_tbl[] = { static DEFINE_PCI_DEVICE_TABLE(te12xp_pci_tbl) = {
{ 0xd161, 0x0120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &te120p}, { 0xd161, 0x0120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &te120p},
{ 0xd161, 0x8000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &te121}, { 0xd161, 0x8000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &te121},
{ 0xd161, 0x8001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &te122}, { 0xd161, 0x8001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &te122},

5
include/dahdi/kernel.h
View File

@ -1324,6 +1324,11 @@ wait_for_completion_interruptible_timeout(struct completion *x,
#define mutex_unlock(_x) up(_x) #define mutex_unlock(_x) up(_x)
#endif #endif
#ifndef DEFINE_PCI_DEVICE_TABLE
#define DEFINE_PCI_DEVICE_TABLE(_x) \
const struct pci_device_id _x[] __devinitdata
#endif
#ifndef DMA_BIT_MASK #ifndef DMA_BIT_MASK
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
#endif #endif