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:
parent
5d95f8e2dd
commit
2b2c5d8c1d
|
@ -475,7 +475,7 @@ static void __devexit bcm63xx_cb_exit(struct pci_dev *dev)
|
||||||
bcm63xx_cb_dev = NULL;
|
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,
|
.vendor = PCI_VENDOR_ID_BROADCOM,
|
||||||
.device = BCM6348_CPU_ID,
|
.device = BCM6348_CPU_ID,
|
||||||
|
|
|
@ -26,13 +26,8 @@
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
|
||||||
/* PCI core routines */
|
/* PCI core routines */
|
||||||
static struct pci_device_id i82092aa_pci_ids[] = {
|
static DEFINE_PCI_DEVICE_TABLE(i82092aa_pci_ids) = {
|
||||||
{
|
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82092AA_0) },
|
||||||
.vendor = PCI_VENDOR_ID_INTEL,
|
|
||||||
.device = PCI_DEVICE_ID_INTEL_82092AA_0,
|
|
||||||
.subvendor = PCI_ANY_ID,
|
|
||||||
.subdevice = PCI_ANY_ID,
|
|
||||||
},
|
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(pci, i82092aa_pci_ids);
|
MODULE_DEVICE_TABLE(pci, i82092aa_pci_ids);
|
||||||
|
|
|
@ -763,13 +763,8 @@ static void __devexit pd6729_pci_remove(struct pci_dev *dev)
|
||||||
kfree(socket);
|
kfree(socket);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct pci_device_id pd6729_pci_ids[] = {
|
static DEFINE_PCI_DEVICE_TABLE(pd6729_pci_ids) = {
|
||||||
{
|
{ PCI_DEVICE(PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_6729) },
|
||||||
.vendor = PCI_VENDOR_ID_CIRRUS,
|
|
||||||
.device = PCI_DEVICE_ID_CIRRUS_6729,
|
|
||||||
.subvendor = PCI_ANY_ID,
|
|
||||||
.subdevice = PCI_ANY_ID,
|
|
||||||
},
|
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(pci, pd6729_pci_ids);
|
MODULE_DEVICE_TABLE(pci, pd6729_pci_ids);
|
||||||
|
|
|
@ -563,11 +563,8 @@ static int __devinit vrc4173_cardu_setup(char *options)
|
||||||
|
|
||||||
__setup("vrc4173_cardu=", vrc4173_cardu_setup);
|
__setup("vrc4173_cardu=", vrc4173_cardu_setup);
|
||||||
|
|
||||||
static struct pci_device_id vrc4173_cardu_id_table[] __devinitdata = {
|
static DEFINE_PCI_DEVICE_TABLE(vrc4173_cardu_id_table) = {
|
||||||
{ .vendor = PCI_VENDOR_ID_NEC,
|
{ PCI_DEVICE(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_NAPCCARD) },
|
||||||
.device = PCI_DEVICE_ID_NEC_NAPCCARD,
|
|
||||||
.subvendor = PCI_ANY_ID,
|
|
||||||
.subdevice = PCI_ANY_ID, },
|
|
||||||
{0, }
|
{0, }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1352,7 +1352,7 @@ static const struct dev_pm_ops yenta_pm_ops = {
|
||||||
.driver_data = CARDBUS_TYPE_##type, \
|
.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),
|
CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1031, TI),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue