Commit 36fcd06c authored by Jingoo Han's avatar Jingoo Han Committed by Lee Jones

mfd: Remove DEFINE_PCI_DEVICE_TABLE macro

Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
is not preferred.
Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 97b583f3
...@@ -172,7 +172,7 @@ static void cs5535_mfd_remove(struct pci_dev *pdev) ...@@ -172,7 +172,7 @@ static void cs5535_mfd_remove(struct pci_dev *pdev)
pci_disable_device(pdev); pci_disable_device(pdev);
} }
static DEFINE_PCI_DEVICE_TABLE(cs5535_mfd_pci_tbl) = { static const struct pci_device_id cs5535_mfd_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA) }, { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA) },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },
{ 0, } { 0, }
......
...@@ -265,7 +265,7 @@ static void cmodio_pci_remove(struct pci_dev *dev) ...@@ -265,7 +265,7 @@ static void cmodio_pci_remove(struct pci_dev *dev)
#define PCI_VENDOR_ID_JANZ 0x13c3 #define PCI_VENDOR_ID_JANZ 0x13c3
/* The list of devices that this module will support */ /* The list of devices that this module will support */
static DEFINE_PCI_DEVICE_TABLE(cmodio_pci_ids) = { static const struct pci_device_id cmodio_pci_ids[] = {
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_JANZ, 0x0101 }, { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_JANZ, 0x0101 },
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_JANZ, 0x0100 }, { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_JANZ, 0x0100 },
{ 0, } { 0, }
......
...@@ -517,7 +517,7 @@ static struct lpc_ich_info lpc_chipset_info[] = { ...@@ -517,7 +517,7 @@ static struct lpc_ich_info lpc_chipset_info[] = {
* pci_driver, because the I/O Controller Hub has also other * pci_driver, because the I/O Controller Hub has also other
* functions that probably will be registered by other drivers. * functions that probably will be registered by other drivers.
*/ */
static DEFINE_PCI_DEVICE_TABLE(lpc_ich_ids) = { static const struct pci_device_id lpc_ich_ids[] = {
{ PCI_VDEVICE(INTEL, 0x2410), LPC_ICH}, { PCI_VDEVICE(INTEL, 0x2410), LPC_ICH},
{ PCI_VDEVICE(INTEL, 0x2420), LPC_ICH0}, { PCI_VDEVICE(INTEL, 0x2420), LPC_ICH0},
{ PCI_VDEVICE(INTEL, 0x2440), LPC_ICH2}, { PCI_VDEVICE(INTEL, 0x2440), LPC_ICH2},
......
...@@ -76,7 +76,7 @@ static struct mfd_cell wdt_sch_cell = { ...@@ -76,7 +76,7 @@ static struct mfd_cell wdt_sch_cell = {
.ignore_resource_conflicts = true, .ignore_resource_conflicts = true,
}; };
static DEFINE_PCI_DEVICE_TABLE(lpc_sch_ids) = { static const struct pci_device_id lpc_sch_ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CENTERTON_ILB) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CENTERTON_ILB) },
......
...@@ -96,7 +96,7 @@ static void rdc321x_sb_remove(struct pci_dev *pdev) ...@@ -96,7 +96,7 @@ static void rdc321x_sb_remove(struct pci_dev *pdev)
mfd_remove_devices(&pdev->dev); mfd_remove_devices(&pdev->dev);
} }
static DEFINE_PCI_DEVICE_TABLE(rdc321x_sb_table) = { static const struct pci_device_id rdc321x_sb_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_RDC, PCI_DEVICE_ID_RDC_R6030) }, { PCI_DEVICE(PCI_VENDOR_ID_RDC, PCI_DEVICE_ID_RDC_R6030) },
{} {}
}; };
......
...@@ -50,7 +50,7 @@ static struct mfd_cell rtsx_pcr_cells[] = { ...@@ -50,7 +50,7 @@ static struct mfd_cell rtsx_pcr_cells[] = {
}, },
}; };
static DEFINE_PCI_DEVICE_TABLE(rtsx_pci_ids) = { static const struct pci_device_id rtsx_pci_ids[] = {
{ PCI_DEVICE(0x10EC, 0x5209), PCI_CLASS_OTHERS << 16, 0xFF0000 }, { PCI_DEVICE(0x10EC, 0x5209), PCI_CLASS_OTHERS << 16, 0xFF0000 },
{ PCI_DEVICE(0x10EC, 0x5229), PCI_CLASS_OTHERS << 16, 0xFF0000 }, { PCI_DEVICE(0x10EC, 0x5229), PCI_CLASS_OTHERS << 16, 0xFF0000 },
{ PCI_DEVICE(0x10EC, 0x5289), PCI_CLASS_OTHERS << 16, 0xFF0000 }, { PCI_DEVICE(0x10EC, 0x5289), PCI_CLASS_OTHERS << 16, 0xFF0000 },
......
...@@ -1710,7 +1710,7 @@ static int sm501_plat_remove(struct platform_device *dev) ...@@ -1710,7 +1710,7 @@ static int sm501_plat_remove(struct platform_device *dev)
return 0; return 0;
} }
static DEFINE_PCI_DEVICE_TABLE(sm501_pci_tbl) = { static const struct pci_device_id sm501_pci_tbl[] = {
{ 0x126f, 0x0501, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { 0x126f, 0x0501, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0, }, { 0, },
}; };
......
...@@ -642,7 +642,7 @@ static int sta2x11_mfd_probe(struct pci_dev *pdev, ...@@ -642,7 +642,7 @@ static int sta2x11_mfd_probe(struct pci_dev *pdev,
return err; return err;
} }
static DEFINE_PCI_DEVICE_TABLE(sta2x11_mfd_tbl) = { static const struct pci_device_id sta2x11_mfd_tbl[] = {
{PCI_DEVICE(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_GPIO)}, {PCI_DEVICE(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_GPIO)},
{PCI_DEVICE(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_VIC)}, {PCI_DEVICE(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_VIC)},
{0,}, {0,},
......
...@@ -851,7 +851,7 @@ static void timb_remove(struct pci_dev *dev) ...@@ -851,7 +851,7 @@ static void timb_remove(struct pci_dev *dev)
kfree(priv); kfree(priv);
} }
static DEFINE_PCI_DEVICE_TABLE(timberdale_pci_tbl) = { static const struct pci_device_id timberdale_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_TIMB, PCI_DEVICE_ID_TIMB) }, { PCI_DEVICE(PCI_VENDOR_ID_TIMB, PCI_DEVICE_ID_TIMB) },
{ 0 } { 0 }
}; };
......
...@@ -118,7 +118,7 @@ static void vx855_remove(struct pci_dev *pdev) ...@@ -118,7 +118,7 @@ static void vx855_remove(struct pci_dev *pdev)
pci_disable_device(pdev); pci_disable_device(pdev);
} }
static DEFINE_PCI_DEVICE_TABLE(vx855_pci_tbl) = { static const struct pci_device_id vx855_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855) }, { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855) },
{ 0, } { 0, }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment