[svn-commits] sruffell: branch linux/2.4 r9691 - in /linux/branches/2.4: drivers/dahdi/ dri...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Jan 20 23:32:51 CST 2011
Author: sruffell
Date: Thu Jan 20 23:32:45 2011
New Revision: 9691
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9691
Log:
"struct pci_device_id[]" -> "DEFINE_PCI_DEVICE_TABLE"
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 at digium.com>
Acked-by: Kinsey Moore <kmoore at digium.com>
Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9584
Modified:
linux/branches/2.4/drivers/dahdi/pciradio.c
linux/branches/2.4/drivers/dahdi/tor2-hw.h
linux/branches/2.4/drivers/dahdi/wcb4xxp/base.c
linux/branches/2.4/drivers/dahdi/wcfxo.c
linux/branches/2.4/drivers/dahdi/wct1xxp.c
linux/branches/2.4/drivers/dahdi/wct4xxp/base.c
linux/branches/2.4/drivers/dahdi/wctc4xxp/base.c
linux/branches/2.4/drivers/dahdi/wctdm.c
linux/branches/2.4/drivers/dahdi/wctdm24xxp/base.c
linux/branches/2.4/drivers/dahdi/wcte11xp.c
linux/branches/2.4/drivers/dahdi/wcte12xp/base.c
linux/branches/2.4/include/dahdi/kernel.h
Modified: linux/branches/2.4/drivers/dahdi/pciradio.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/drivers/dahdi/pciradio.c?view=diff&rev=9691&r1=9690&r2=9691
==============================================================================
--- linux/branches/2.4/drivers/dahdi/pciradio.c (original)
+++ linux/branches/2.4/drivers/dahdi/pciradio.c Thu Jan 20 23:32:45 2011
@@ -1852,7 +1852,7 @@
}
}
-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" },
{ 0 }
};
Modified: linux/branches/2.4/drivers/dahdi/tor2-hw.h
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/drivers/dahdi/tor2-hw.h?view=diff&rev=9691&r1=9690&r2=9691
==============================================================================
--- linux/branches/2.4/drivers/dahdi/tor2-hw.h (original)
+++ linux/branches/2.4/drivers/dahdi/tor2-hw.h Thu Jan 20 23:32:45 2011
@@ -108,7 +108,7 @@
#define PCI_VENDOR_ID_PLX 0x10b5
#ifdef __KERNEL__
-static struct pci_device_id tor2_pci_ids[] =
+static DEFINE_PCI_DEVICE_TABLE(tor2_pci_ids) =
#else
#define PCI_ANY_ID -1
static struct tor2_pci_id {
Modified: linux/branches/2.4/drivers/dahdi/wcb4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/drivers/dahdi/wcb4xxp/base.c?view=diff&rev=9691&r1=9690&r2=9691
==============================================================================
--- linux/branches/2.4/drivers/dahdi/wcb4xxp/base.c (original)
+++ linux/branches/2.4/drivers/dahdi/wcb4xxp/base.c Thu Jan 20 23:32:45 2011
@@ -2946,7 +2946,7 @@
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 },
{ 0x1397, 0x16b8, 0x1397, 0xb552, 0, 0, (unsigned long)&hfc8s },
Modified: linux/branches/2.4/drivers/dahdi/wcfxo.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/drivers/dahdi/wcfxo.c?view=diff&rev=9691&r1=9690&r2=9691
==============================================================================
--- linux/branches/2.4/drivers/dahdi/wcfxo.c (original)
+++ linux/branches/2.4/drivers/dahdi/wcfxo.c Thu Jan 20 23:32:45 2011
@@ -1031,7 +1031,7 @@
}
}
-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, 0x8085, PCI_ANY_ID, 0, 0, (unsigned long) &wcx101p },
{ 0xe159, 0x0001, 0x8086, PCI_ANY_ID, 0, 0, (unsigned long) &generic },
Modified: linux/branches/2.4/drivers/dahdi/wct1xxp.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/drivers/dahdi/wct1xxp.c?view=diff&rev=9691&r1=9690&r2=9691
==============================================================================
--- linux/branches/2.4/drivers/dahdi/wct1xxp.c (original)
+++ linux/branches/2.4/drivers/dahdi/wct1xxp.c Thu Jan 20 23:32:45 2011
@@ -1402,7 +1402,7 @@
}
}
-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" },
{ 0 }
};
Modified: linux/branches/2.4/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/drivers/dahdi/wct4xxp/base.c?view=diff&rev=9691&r1=9690&r2=9691
==============================================================================
--- linux/branches/2.4/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/branches/2.4/drivers/dahdi/wct4xxp/base.c Thu Jan 20 23:32:45 2011
@@ -4895,7 +4895,7 @@
}
-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 },
Modified: linux/branches/2.4/drivers/dahdi/wctc4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/drivers/dahdi/wctc4xxp/base.c?view=diff&rev=9691&r1=9690&r2=9691
==============================================================================
--- linux/branches/2.4/drivers/dahdi/wctc4xxp/base.c (original)
+++ linux/branches/2.4/drivers/dahdi/wctc4xxp/base.c Thu Jan 20 23:32:45 2011
@@ -3712,7 +3712,7 @@
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,
0, 0, (unsigned long) &wctc400p }, /* Digium board */
{ 0xd161, 0x8004, PCI_ANY_ID, PCI_ANY_ID,
Modified: linux/branches/2.4/drivers/dahdi/wctdm.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/drivers/dahdi/wctdm.c?view=diff&rev=9691&r1=9690&r2=9691
==============================================================================
--- linux/branches/2.4/drivers/dahdi/wctdm.c (original)
+++ linux/branches/2.4/drivers/dahdi/wctdm.c Thu Jan 20 23:32:45 2011
@@ -2746,7 +2746,7 @@
}
}
-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, 0xe159, PCI_ANY_ID, 0, 0, (unsigned long) &wctdm },
{ 0xe159, 0x0001, 0xb100, PCI_ANY_ID, 0, 0, (unsigned long) &wctdme },
Modified: linux/branches/2.4/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=9691&r1=9690&r2=9691
==============================================================================
--- linux/branches/2.4/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/branches/2.4/drivers/dahdi/wctdm24xxp/base.c Thu Jan 20 23:32:45 2011
@@ -5225,7 +5225,7 @@
}
}
-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, 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 },
Modified: linux/branches/2.4/drivers/dahdi/wcte11xp.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/drivers/dahdi/wcte11xp.c?view=diff&rev=9691&r1=9690&r2=9691
==============================================================================
--- linux/branches/2.4/drivers/dahdi/wcte11xp.c (original)
+++ linux/branches/2.4/drivers/dahdi/wcte11xp.c Thu Jan 20 23:32:45 2011
@@ -1586,7 +1586,7 @@
}
}
-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, 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" },
Modified: linux/branches/2.4/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/drivers/dahdi/wcte12xp/base.c?view=diff&rev=9691&r1=9690&r2=9691
==============================================================================
--- linux/branches/2.4/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/branches/2.4/drivers/dahdi/wcte12xp/base.c Thu Jan 20 23:32:45 2011
@@ -2406,7 +2406,7 @@
t1_release(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, 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},
Modified: linux/branches/2.4/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/include/dahdi/kernel.h?view=diff&rev=9691&r1=9690&r2=9691
==============================================================================
--- linux/branches/2.4/include/dahdi/kernel.h (original)
+++ linux/branches/2.4/include/dahdi/kernel.h Thu Jan 20 23:32:45 2011
@@ -1273,6 +1273,11 @@
#define mutex_unlock(_x) up(_x)
#endif
+#ifndef DEFINE_PCI_DEVICE_TABLE
+#define DEFINE_PCI_DEVICE_TABLE(_x) \
+ const struct pci_device_id _x[] __devinitdata
+#endif
+
#ifndef DMA_BIT_MASK
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
#endif
More information about the svn-commits
mailing list