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>
このコミットが含まれているのは:
@@ -101,7 +101,7 @@ struct ems_pci_card {
|
||||
|
||||
#define EMS_PCI_BASE_SIZE 4096 /* size of controller area */
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(ems_pci_tbl) = {
|
||||
static const struct pci_device_id ems_pci_tbl[] = {
|
||||
/* CPC-PCI v1 */
|
||||
{PCI_VENDOR_ID_SIEMENS, 0x2104, PCI_ANY_ID, PCI_ANY_ID,},
|
||||
/* CPC-PCI v2 */
|
||||
|
@@ -107,7 +107,7 @@ struct kvaser_pci {
|
||||
#define KVASER_PCI_VENDOR_ID2 0x1a07 /* the PCI device and vendor IDs */
|
||||
#define KVASER_PCI_DEVICE_ID2 0x0008
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(kvaser_pci_tbl) = {
|
||||
static const struct pci_device_id kvaser_pci_tbl[] = {
|
||||
{KVASER_PCI_VENDOR_ID1, KVASER_PCI_DEVICE_ID1, PCI_ANY_ID, PCI_ANY_ID,},
|
||||
{KVASER_PCI_VENDOR_ID2, KVASER_PCI_DEVICE_ID2, PCI_ANY_ID, PCI_ANY_ID,},
|
||||
{ 0,}
|
||||
|
@@ -77,7 +77,7 @@ static const u16 peak_pci_icr_masks[PEAK_PCI_CHAN_MAX] = {
|
||||
0x02, 0x01, 0x40, 0x80
|
||||
};
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(peak_pci_tbl) = {
|
||||
static const struct pci_device_id peak_pci_tbl[] = {
|
||||
{PEAK_PCI_VENDOR_ID, PEAK_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
|
||||
{PEAK_PCI_VENDOR_ID, PEAK_PCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
|
||||
{PEAK_PCI_VENDOR_ID, PEAK_MPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
|
||||
|
@@ -247,7 +247,7 @@ static struct plx_pci_card_info plx_pci_card_info_elcus = {
|
||||
/* based on PLX9030 */
|
||||
};
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(plx_pci_tbl) = {
|
||||
static const struct pci_device_id plx_pci_tbl[] = {
|
||||
{
|
||||
/* Adlink PCI-7841/cPCI-7841 */
|
||||
ADLINK_PCI_VENDOR_ID, ADLINK_PCI_DEVICE_ID,
|
||||
|
新しいイシューから参照
ユーザーをブロックする