OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE 

Convert static struct pci_device_id *[] to static DEFINE_PCI_DEVICE_TABLE
tables. Also convert to use PCI_DEVICE macro for better readablity.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Axel Lin 2011-12-27 16:17:46 +08:00 committed by Dominik Brodowski
parent 5d95f8e2dd
commit 2b2c5d8c1d
5 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pcmcia/bcm63xx_pcmcia.c
View File

@ -475,7 +475,7 @@ static void __devexit bcm63xx_cb_exit(struct pci_dev *dev)
bcm63xx_cb_dev = NULL;
}
static struct pci_device_id bcm63xx_cb_table[] = {
static DEFINE_PCI_DEVICE_TABLE(bcm63xx_cb_table) = {
{
.vendor = PCI_VENDOR_ID_BROADCOM,
.device = BCM6348_CPU_ID,

11
drivers/pcmcia/i82092.c
View File

@ -26,14 +26,9 @@
MODULE_LICENSE("GPL");
/* PCI core routines */
static struct pci_device_id i82092aa_pci_ids[] = {
{
.vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_INTEL_82092AA_0,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
},
{}
static DEFINE_PCI_DEVICE_TABLE(i82092aa_pci_ids) = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82092AA_0) },
{ }
};
MODULE_DEVICE_TABLE(pci, i82092aa_pci_ids);

9
drivers/pcmcia/pd6729.c
View File

@ -763,13 +763,8 @@ static void __devexit pd6729_pci_remove(struct pci_dev *dev)
kfree(socket);
}
static struct pci_device_id pd6729_pci_ids[] = {
{
.vendor = PCI_VENDOR_ID_CIRRUS,
.device = PCI_DEVICE_ID_CIRRUS_6729,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
},
static DEFINE_PCI_DEVICE_TABLE(pd6729_pci_ids) = {
{ PCI_DEVICE(PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_6729) },
{ }
};
MODULE_DEVICE_TABLE(pci, pd6729_pci_ids);

7
drivers/pcmcia/vrc4173_cardu.c
View File

@ -563,11 +563,8 @@ static int __devinit vrc4173_cardu_setup(char *options)
__setup("vrc4173_cardu=", vrc4173_cardu_setup);
static struct pci_device_id vrc4173_cardu_id_table[] __devinitdata = {
{ .vendor = PCI_VENDOR_ID_NEC,
.device = PCI_DEVICE_ID_NEC_NAPCCARD,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID, },
static DEFINE_PCI_DEVICE_TABLE(vrc4173_cardu_id_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_NAPCCARD) },
{0, }
};

2
drivers/pcmcia/yenta_socket.c
View File

@ -1352,7 +1352,7 @@ static const struct dev_pm_ops yenta_pm_ops = {
.driver_data = CARDBUS_TYPE_##type, \
}
static struct pci_device_id yenta_table[] = {
static DEFINE_PCI_DEVICE_TABLE(yenta_table) = {
CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1031, TI),
/*