EDAC: Remove DEFINE_PCI_DEVICE_TABLE macro
Currently, there is no other bus that has something like this macro for their device ids. Thus, DEFINE_PCI_DEVICE_TABLE macro should be removed. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Link: http://lkml.kernel.org/r/001c01ceefb3$5724d860$056e8920$%han@samsung.com [ Boris: swap commit message with better one. ] Signed-off-by: Borislav Petkov <bp@suse.de>
This commit is contained in:
Родитель
7f3f5240ce
Коммит
ba935f4097
|
@ -2795,7 +2795,7 @@ static void amd64_remove_one_instance(struct pci_dev *pdev)
|
||||||
* PCI core identifies what devices are on a system during boot, and then
|
* PCI core identifies what devices are on a system during boot, and then
|
||||||
* inquiry this table to see if this driver is for a given device found.
|
* inquiry this table to see if this driver is for a given device found.
|
||||||
*/
|
*/
|
||||||
static DEFINE_PCI_DEVICE_TABLE(amd64_pci_table) = {
|
static const struct pci_device_id amd64_pci_table[] = {
|
||||||
{
|
{
|
||||||
.vendor = PCI_VENDOR_ID_AMD,
|
.vendor = PCI_VENDOR_ID_AMD,
|
||||||
.device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
|
.device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
|
||||||
|
|
|
@ -333,7 +333,7 @@ static void amd76x_remove_one(struct pci_dev *pdev)
|
||||||
edac_mc_free(mci);
|
edac_mc_free(mci);
|
||||||
}
|
}
|
||||||
|
|
||||||
static DEFINE_PCI_DEVICE_TABLE(amd76x_pci_tbl) = {
|
static const struct pci_device_id amd76x_pci_tbl[] = {
|
||||||
{
|
{
|
||||||
PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||||
AMD762},
|
AMD762},
|
||||||
|
|
|
@ -1421,7 +1421,7 @@ static void e752x_remove_one(struct pci_dev *pdev)
|
||||||
edac_mc_free(mci);
|
edac_mc_free(mci);
|
||||||
}
|
}
|
||||||
|
|
||||||
static DEFINE_PCI_DEVICE_TABLE(e752x_pci_tbl) = {
|
static const struct pci_device_id e752x_pci_tbl[] = {
|
||||||
{
|
{
|
||||||
PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||||
E7520},
|
E7520},
|
||||||
|
|
|
@ -555,7 +555,7 @@ static void e7xxx_remove_one(struct pci_dev *pdev)
|
||||||
edac_mc_free(mci);
|
edac_mc_free(mci);
|
||||||
}
|
}
|
||||||
|
|
||||||
static DEFINE_PCI_DEVICE_TABLE(e7xxx_pci_tbl) = {
|
static const struct pci_device_id e7xxx_pci_tbl[] = {
|
||||||
{
|
{
|
||||||
PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||||
E7205},
|
E7205},
|
||||||
|
|
|
@ -487,7 +487,7 @@ static void i3000_remove_one(struct pci_dev *pdev)
|
||||||
edac_mc_free(mci);
|
edac_mc_free(mci);
|
||||||
}
|
}
|
||||||
|
|
||||||
static DEFINE_PCI_DEVICE_TABLE(i3000_pci_tbl) = {
|
static const struct pci_device_id i3000_pci_tbl[] = {
|
||||||
{
|
{
|
||||||
PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||||
I3000},
|
I3000},
|
||||||
|
|
|
@ -466,7 +466,7 @@ static void i3200_remove_one(struct pci_dev *pdev)
|
||||||
edac_mc_free(mci);
|
edac_mc_free(mci);
|
||||||
}
|
}
|
||||||
|
|
||||||
static DEFINE_PCI_DEVICE_TABLE(i3200_pci_tbl) = {
|
static const struct pci_device_id i3200_pci_tbl[] = {
|
||||||
{
|
{
|
||||||
PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||||
I3200},
|
I3200},
|
||||||
|
|
|
@ -1530,7 +1530,7 @@ static void i5000_remove_one(struct pci_dev *pdev)
|
||||||
*
|
*
|
||||||
* The "E500P" device is the first device supported.
|
* The "E500P" device is the first device supported.
|
||||||
*/
|
*/
|
||||||
static DEFINE_PCI_DEVICE_TABLE(i5000_pci_tbl) = {
|
static const struct pci_device_id i5000_pci_tbl[] = {
|
||||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
|
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
|
||||||
.driver_data = I5000P},
|
.driver_data = I5000P},
|
||||||
|
|
||||||
|
|
|
@ -1213,7 +1213,7 @@ static void i5100_remove_one(struct pci_dev *pdev)
|
||||||
edac_mc_free(mci);
|
edac_mc_free(mci);
|
||||||
}
|
}
|
||||||
|
|
||||||
static DEFINE_PCI_DEVICE_TABLE(i5100_pci_tbl) = {
|
static const struct pci_device_id i5100_pci_tbl[] = {
|
||||||
/* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */
|
/* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */
|
||||||
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) },
|
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) },
|
||||||
{ 0, }
|
{ 0, }
|
||||||
|
|
|
@ -1416,7 +1416,7 @@ static void i5400_remove_one(struct pci_dev *pdev)
|
||||||
*
|
*
|
||||||
* The "E500P" device is the first device supported.
|
* The "E500P" device is the first device supported.
|
||||||
*/
|
*/
|
||||||
static DEFINE_PCI_DEVICE_TABLE(i5400_pci_tbl) = {
|
static const struct pci_device_id i5400_pci_tbl[] = {
|
||||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
|
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
|
||||||
{0,} /* 0 terminated list. */
|
{0,} /* 0 terminated list. */
|
||||||
};
|
};
|
||||||
|
|
|
@ -1160,7 +1160,7 @@ static void i7300_remove_one(struct pci_dev *pdev)
|
||||||
*
|
*
|
||||||
* Has only 8086:360c PCI ID
|
* Has only 8086:360c PCI ID
|
||||||
*/
|
*/
|
||||||
static DEFINE_PCI_DEVICE_TABLE(i7300_pci_tbl) = {
|
static const struct pci_device_id i7300_pci_tbl[] = {
|
||||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)},
|
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)},
|
||||||
{0,} /* 0 terminated list. */
|
{0,} /* 0 terminated list. */
|
||||||
};
|
};
|
||||||
|
|
|
@ -394,7 +394,7 @@ static const struct pci_id_table pci_dev_table[] = {
|
||||||
/*
|
/*
|
||||||
* pci_device_id table for which devices we are looking for
|
* pci_device_id table for which devices we are looking for
|
||||||
*/
|
*/
|
||||||
static DEFINE_PCI_DEVICE_TABLE(i7core_pci_tbl) = {
|
static const struct pci_device_id i7core_pci_tbl[] = {
|
||||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)},
|
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)},
|
||||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)},
|
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)},
|
||||||
{0,} /* 0 terminated list. */
|
{0,} /* 0 terminated list. */
|
||||||
|
|
|
@ -386,7 +386,7 @@ static void i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)
|
||||||
|
|
||||||
EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
|
EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
|
||||||
|
|
||||||
static DEFINE_PCI_DEVICE_TABLE(i82443bxgx_pci_tbl) = {
|
static const struct pci_device_id i82443bxgx_pci_tbl[] = {
|
||||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)},
|
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)},
|
||||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)},
|
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)},
|
||||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
|
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
|
||||||
|
|
|
@ -288,7 +288,7 @@ static void i82860_remove_one(struct pci_dev *pdev)
|
||||||
edac_mc_free(mci);
|
edac_mc_free(mci);
|
||||||
}
|
}
|
||||||
|
|
||||||
static DEFINE_PCI_DEVICE_TABLE(i82860_pci_tbl) = {
|
static const struct pci_device_id i82860_pci_tbl[] = {
|
||||||
{
|
{
|
||||||
PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||||
I82860},
|
I82860},
|
||||||
|
|
|
@ -527,7 +527,7 @@ static void i82875p_remove_one(struct pci_dev *pdev)
|
||||||
edac_mc_free(mci);
|
edac_mc_free(mci);
|
||||||
}
|
}
|
||||||
|
|
||||||
static DEFINE_PCI_DEVICE_TABLE(i82875p_pci_tbl) = {
|
static const struct pci_device_id i82875p_pci_tbl[] = {
|
||||||
{
|
{
|
||||||
PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||||
I82875P},
|
I82875P},
|
||||||
|
|
|
@ -628,7 +628,7 @@ static void i82975x_remove_one(struct pci_dev *pdev)
|
||||||
edac_mc_free(mci);
|
edac_mc_free(mci);
|
||||||
}
|
}
|
||||||
|
|
||||||
static DEFINE_PCI_DEVICE_TABLE(i82975x_pci_tbl) = {
|
static const struct pci_device_id i82975x_pci_tbl[] = {
|
||||||
{
|
{
|
||||||
PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||||
I82975X
|
I82975X
|
||||||
|
|
|
@ -383,7 +383,7 @@ static void r82600_remove_one(struct pci_dev *pdev)
|
||||||
edac_mc_free(mci);
|
edac_mc_free(mci);
|
||||||
}
|
}
|
||||||
|
|
||||||
static DEFINE_PCI_DEVICE_TABLE(r82600_pci_tbl) = {
|
static const struct pci_device_id r82600_pci_tbl[] = {
|
||||||
{
|
{
|
||||||
PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
|
PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
|
||||||
},
|
},
|
||||||
|
|
|
@ -461,7 +461,7 @@ static const struct pci_id_table pci_dev_descr_ibridge_table[] = {
|
||||||
/*
|
/*
|
||||||
* pci_device_id table for which devices we are looking for
|
* pci_device_id table for which devices we are looking for
|
||||||
*/
|
*/
|
||||||
static DEFINE_PCI_DEVICE_TABLE(sbridge_pci_tbl) = {
|
static const struct pci_device_id sbridge_pci_tbl[] = {
|
||||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA)},
|
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA)},
|
||||||
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TA)},
|
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TA)},
|
||||||
{0,} /* 0 terminated list. */
|
{0,} /* 0 terminated list. */
|
||||||
|
|
|
@ -448,7 +448,7 @@ static void x38_remove_one(struct pci_dev *pdev)
|
||||||
edac_mc_free(mci);
|
edac_mc_free(mci);
|
||||||
}
|
}
|
||||||
|
|
||||||
static DEFINE_PCI_DEVICE_TABLE(x38_pci_tbl) = {
|
static const struct pci_device_id x38_pci_tbl[] = {
|
||||||
{
|
{
|
||||||
PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||||
X38},
|
X38},
|
||||||
|
|
Загрузка…
Ссылка в новой задаче