Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mfd: Remove DEFINE_PCI_DEVICE_TABLE macro

Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
is not preferred.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

authored by

Jingoo Han and committed by
Lee Jones
36fcd06c 97b583f3

+10 -10
+1 -1
drivers/mfd/cs5535-mfd.c
··· 172 172 pci_disable_device(pdev); 173 173 } 174 174 175 - static DEFINE_PCI_DEVICE_TABLE(cs5535_mfd_pci_tbl) = { 175 + static const struct pci_device_id cs5535_mfd_pci_tbl[] = { 176 176 { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA) }, 177 177 { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) }, 178 178 { 0, }
+1 -1
drivers/mfd/janz-cmodio.c
··· 265 265 #define PCI_VENDOR_ID_JANZ 0x13c3 266 266 267 267 /* The list of devices that this module will support */ 268 - static DEFINE_PCI_DEVICE_TABLE(cmodio_pci_ids) = { 268 + static const struct pci_device_id cmodio_pci_ids[] = { 269 269 { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_JANZ, 0x0101 }, 270 270 { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_JANZ, 0x0100 }, 271 271 { 0, }
+1 -1
drivers/mfd/lpc_ich.c
··· 517 517 * pci_driver, because the I/O Controller Hub has also other 518 518 * functions that probably will be registered by other drivers. 519 519 */ 520 - static DEFINE_PCI_DEVICE_TABLE(lpc_ich_ids) = { 520 + static const struct pci_device_id lpc_ich_ids[] = { 521 521 { PCI_VDEVICE(INTEL, 0x2410), LPC_ICH}, 522 522 { PCI_VDEVICE(INTEL, 0x2420), LPC_ICH0}, 523 523 { PCI_VDEVICE(INTEL, 0x2440), LPC_ICH2},
+1 -1
drivers/mfd/lpc_sch.c
··· 76 76 .ignore_resource_conflicts = true, 77 77 }; 78 78 79 - static DEFINE_PCI_DEVICE_TABLE(lpc_sch_ids) = { 79 + static const struct pci_device_id lpc_sch_ids[] = { 80 80 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC) }, 81 81 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC) }, 82 82 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CENTERTON_ILB) },
+1 -1
drivers/mfd/rdc321x-southbridge.c
··· 96 96 mfd_remove_devices(&pdev->dev); 97 97 } 98 98 99 - static DEFINE_PCI_DEVICE_TABLE(rdc321x_sb_table) = { 99 + static const struct pci_device_id rdc321x_sb_table[] = { 100 100 { PCI_DEVICE(PCI_VENDOR_ID_RDC, PCI_DEVICE_ID_RDC_R6030) }, 101 101 {} 102 102 };
+1 -1
drivers/mfd/rtsx_pcr.c
··· 50 50 }, 51 51 }; 52 52 53 - static DEFINE_PCI_DEVICE_TABLE(rtsx_pci_ids) = { 53 + static const struct pci_device_id rtsx_pci_ids[] = { 54 54 { PCI_DEVICE(0x10EC, 0x5209), PCI_CLASS_OTHERS << 16, 0xFF0000 }, 55 55 { PCI_DEVICE(0x10EC, 0x5229), PCI_CLASS_OTHERS << 16, 0xFF0000 }, 56 56 { PCI_DEVICE(0x10EC, 0x5289), PCI_CLASS_OTHERS << 16, 0xFF0000 },
+1 -1
drivers/mfd/sm501.c
··· 1710 1710 return 0; 1711 1711 } 1712 1712 1713 - static DEFINE_PCI_DEVICE_TABLE(sm501_pci_tbl) = { 1713 + static const struct pci_device_id sm501_pci_tbl[] = { 1714 1714 { 0x126f, 0x0501, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, 1715 1715 { 0, }, 1716 1716 };
+1 -1
drivers/mfd/sta2x11-mfd.c
··· 642 642 return err; 643 643 } 644 644 645 - static DEFINE_PCI_DEVICE_TABLE(sta2x11_mfd_tbl) = { 645 + static const struct pci_device_id sta2x11_mfd_tbl[] = { 646 646 {PCI_DEVICE(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_GPIO)}, 647 647 {PCI_DEVICE(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_VIC)}, 648 648 {0,},
+1 -1
drivers/mfd/timberdale.c
··· 851 851 kfree(priv); 852 852 } 853 853 854 - static DEFINE_PCI_DEVICE_TABLE(timberdale_pci_tbl) = { 854 + static const struct pci_device_id timberdale_pci_tbl[] = { 855 855 { PCI_DEVICE(PCI_VENDOR_ID_TIMB, PCI_DEVICE_ID_TIMB) }, 856 856 { 0 } 857 857 };
+1 -1
drivers/mfd/vx855.c
··· 118 118 pci_disable_device(pdev); 119 119 } 120 120 121 - static DEFINE_PCI_DEVICE_TABLE(vx855_pci_tbl) = { 121 + static const struct pci_device_id vx855_pci_tbl[] = { 122 122 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855) }, 123 123 { 0, } 124 124 };