PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use
We should prefer `struct pci_device_id` over `DEFINE_PCI_DEVICE_TABLE` to meet kernel coding style guidelines. This issue was reported by checkpatch. A simplified version of the semantic patch that makes this change is as follows (http://coccinelle.lip6.fr/): // <smpl> @@ identifier i; declarer name DEFINE_PCI_DEVICE_TABLE; initializer z; @@ - DEFINE_PCI_DEVICE_TABLE(i) + const struct pci_device_id i[] = z; // </smpl> [bhelgaas: add semantic patch] Signed-off-by: Benoit Taine <benoit.taine@lip6.fr> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:

committed by
Bjorn Helgaas

parent
c8d6637d04
commit
9baa3c34ac
@@ -1527,7 +1527,7 @@ static const struct pci_error_handlers alx_err_handlers = {
|
||||
.resume = alx_pci_error_resume,
|
||||
};
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(alx_pci_tbl) = {
|
||||
static const struct pci_device_id alx_pci_tbl[] = {
|
||||
{ PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_AR8161),
|
||||
.driver_data = ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG },
|
||||
{ PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_E2200),
|
||||
|
@@ -34,7 +34,7 @@ char atl1c_driver_version[] = ATL1C_DRV_VERSION;
|
||||
* { Vendor ID, Device ID, SubVendor ID, SubDevice ID,
|
||||
* Class, Class Mask, private data (not used) }
|
||||
*/
|
||||
static DEFINE_PCI_DEVICE_TABLE(atl1c_pci_tbl) = {
|
||||
static const struct pci_device_id atl1c_pci_tbl[] = {
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1C)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L2C)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B)},
|
||||
|
@@ -35,7 +35,7 @@ char atl1e_driver_version[] = DRV_VERSION;
|
||||
* { Vendor ID, Device ID, SubVendor ID, SubDevice ID,
|
||||
* Class, Class Mask, private data (not used) }
|
||||
*/
|
||||
static DEFINE_PCI_DEVICE_TABLE(atl1e_pci_tbl) = {
|
||||
static const struct pci_device_id atl1e_pci_tbl[] = {
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1E)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, 0x1066)},
|
||||
/* required last entry */
|
||||
|
@@ -235,7 +235,7 @@ static void atl1_check_options(struct atl1_adapter *adapter)
|
||||
/*
|
||||
* atl1_pci_tbl - PCI Device ID Table
|
||||
*/
|
||||
static DEFINE_PCI_DEVICE_TABLE(atl1_pci_tbl) = {
|
||||
static const struct pci_device_id atl1_pci_tbl[] = {
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1)},
|
||||
/* required last entry */
|
||||
{0,}
|
||||
|
@@ -65,7 +65,7 @@ MODULE_VERSION(ATL2_DRV_VERSION);
|
||||
/*
|
||||
* atl2_pci_tbl - PCI Device ID Table
|
||||
*/
|
||||
static DEFINE_PCI_DEVICE_TABLE(atl2_pci_tbl) = {
|
||||
static const struct pci_device_id atl2_pci_tbl[] = {
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L2)},
|
||||
/* required last entry */
|
||||
{0,}
|
||||
|
Reference in New Issue
Block a user