Skip to content

Commit a11c5c9

Browse files
torvaldstorvalds
committed
Merge tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull DEFINE_PCI_DEVICE_TABLE removal from Bjorn Helgaas: "Part two of the PCI changes for v3.17: - Remove DEFINE_PCI_DEVICE_TABLE macro use (Benoit Taine) It's a mechanical change that removes uses of the DEFINE_PCI_DEVICE_TABLE macro. I waited until later in the merge window to reduce conflicts, but it's possible you'll still see a few" * tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use
2 parents 179c0ac + 9baa3c3 commit a11c5c9

File tree

230 files changed

+242
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+242
-240
lines changed

‎arch/x86/kernel/cpu/perf_event_intel_uncore.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ static struct intel_uncore_type *snbep_pci_uncores[] = {
945945
NULL,
946946
};
947947

948-
static DEFINE_PCI_DEVICE_TABLE(snbep_uncore_pci_ids) = {
948+
static const struct pci_device_id snbep_uncore_pci_ids[] = {
949949
{ /* Home Agent */
950950
PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_HA),
951951
.driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_HA, 0),
@@ -1510,7 +1510,7 @@ static struct intel_uncore_type *ivt_pci_uncores[] = {
15101510
NULL,
15111511
};
15121512

1513-
static DEFINE_PCI_DEVICE_TABLE(ivt_uncore_pci_ids) = {
1513+
static const struct pci_device_id ivt_uncore_pci_ids[] = {
15141514
{ /* Home Agent 0 */
15151515
PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe30),
15161516
.driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_HA, 0),
@@ -1985,23 +1985,23 @@ static struct intel_uncore_type *snb_pci_uncores[] = {
19851985
NULL,
19861986
};
19871987

1988-
static DEFINE_PCI_DEVICE_TABLE(snb_uncore_pci_ids) = {
1988+
static const struct pci_device_id snb_uncore_pci_ids[] = {
19891989
{ /* IMC */
19901990
PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SNB_IMC),
19911991
.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
19921992
},
19931993
{ /* end: all zeroes */ },
19941994
};
19951995

1996-
static DEFINE_PCI_DEVICE_TABLE(ivb_uncore_pci_ids) = {
1996+
static const struct pci_device_id ivb_uncore_pci_ids[] = {
19971997
{ /* IMC */
19981998
PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IVB_IMC),
19991999
.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
20002000
},
20012001
{ /* end: all zeroes */ },
20022002
};
20032003

2004-
static DEFINE_PCI_DEVICE_TABLE(hsw_uncore_pci_ids) = {
2004+
static const struct pci_device_id hsw_uncore_pci_ids[] = {
20052005
{ /* IMC */
20062006
PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HSW_IMC),
20072007
.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),

‎arch/x86/kernel/iosf_mbi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ static int iosf_mbi_probe(struct pci_dev *pdev,
202202
return 0;
203203
}
204204

205-
static DEFINE_PCI_DEVICE_TABLE(iosf_mbi_pci_ids) = {
205+
static const struct pci_device_id iosf_mbi_pci_ids[] = {
206206
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_BAYTRAIL) },
207207
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_QUARK_X1000) },
208208
{ 0, },

‎drivers/block/mtip32xx/mtip32xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4632,7 +4632,7 @@ static void mtip_pci_shutdown(struct pci_dev *pdev)
46324632
}
46334633

46344634
/* Table of device ids supported by this driver. */
4635-
static DEFINE_PCI_DEVICE_TABLE(mtip_pci_tbl) = {
4635+
static const struct pci_device_id mtip_pci_tbl[] = {
46364636
{ PCI_DEVICE(PCI_VENDOR_ID_MICRON, P320H_DEVICE_ID) },
46374637
{ PCI_DEVICE(PCI_VENDOR_ID_MICRON, P320M_DEVICE_ID) },
46384638
{ PCI_DEVICE(PCI_VENDOR_ID_MICRON, P320S_DEVICE_ID) },

‎drivers/block/rsxx/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1137,7 +1137,7 @@ static const struct pci_error_handlers rsxx_err_handler = {
11371137
.slot_reset = rsxx_slot_reset,
11381138
};
11391139

1140-
static DEFINE_PCI_DEVICE_TABLE(rsxx_pci_ids) = {
1140+
static const struct pci_device_id rsxx_pci_ids[] = {
11411141
{PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_FS70_FLASH)},
11421142
{PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_FS80_FLASH)},
11431143
{0,},

‎drivers/block/skd_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4766,7 +4766,7 @@ static const struct block_device_operations skd_blockdev_ops = {
47664766
*****************************************************************************
47674767
*/
47684768

4769-
static DEFINE_PCI_DEVICE_TABLE(skd_pci_tbl) = {
4769+
static const struct pci_device_id skd_pci_tbl[] = {
47704770
{ PCI_VENDOR_ID_STEC, PCI_DEVICE_ID_S1120,
47714771
PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
47724772
{ 0 } /* terminate list */

‎drivers/crypto/ccp/ccp-pci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ static int ccp_pci_resume(struct pci_dev *pdev)
320320
}
321321
#endif
322322

323-
static DEFINE_PCI_DEVICE_TABLE(ccp_pci_table) = {
323+
static const struct pci_device_id ccp_pci_table[] = {
324324
{ PCI_VDEVICE(AMD, 0x1537), },
325325
/* Last entry must be zero */
326326
{ 0, }

‎drivers/gpu/drm/ast/ast_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static struct drm_driver driver;
5151
.subdevice = PCI_ANY_ID, \
5252
.driver_data = (unsigned long) info }
5353

54-
static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
54+
static const struct pci_device_id pciidlist[] = {
5555
AST_VGA_DEVICE(PCI_CHIP_AST2000, NULL),
5656
AST_VGA_DEVICE(PCI_CHIP_AST2100, NULL),
5757
/* AST_VGA_DEVICE(PCI_CHIP_AST1180, NULL), - don't bind to 1180 for now */

‎drivers/gpu/drm/bochs/bochs_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static void bochs_pci_remove(struct pci_dev *pdev)
177177
drm_put_dev(dev);
178178
}
179179

180-
static DEFINE_PCI_DEVICE_TABLE(bochs_pci_tbl) = {
180+
static const struct pci_device_id bochs_pci_tbl[] = {
181181
{
182182
.vendor = 0x1234,
183183
.device = 0x1111,

‎drivers/gpu/drm/cirrus/cirrus_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module_param_named(modeset, cirrus_modeset, int, 0400);
2929
static struct drm_driver driver;
3030

3131
/* only bind to the cirrus chip in qemu */
32-
static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
32+
static const struct pci_device_id pciidlist[] = {
3333
{ PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_5446, 0x1af4, 0x1100, 0,
3434
0, 0 },
3535
{0,}

‎drivers/gpu/drm/gma500/oaktrail_hdmi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ void oaktrail_hdmi_init(struct drm_device *dev,
674674
kfree(gma_encoder);
675675
}
676676

677-
static DEFINE_PCI_DEVICE_TABLE(hdmi_ids) = {
677+
static const struct pci_device_id hdmi_ids[] = {
678678
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080d) },
679679
{ 0 }
680680
};

‎drivers/gpu/drm/gma500/psb_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
5454
* PowerVR SGX545 - Cedartrail - Intel GMA 3650, Intel Atom D2550, D2700,
5555
* N2800
5656
*/
57-
static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
57+
static const struct pci_device_id pciidlist[] = {
5858
{ 0x8086, 0x8108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops },
5959
{ 0x8086, 0x8109, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops },
6060
#if defined(CONFIG_DRM_GMA600)

‎drivers/gpu/drm/mgag200/mgag200_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module_param_named(modeset, mgag200_modeset, int, 0400);
2828

2929
static struct drm_driver driver;
3030

31-
static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
31+
static const struct pci_device_id pciidlist[] = {
3232
{ PCI_VENDOR_ID_MATROX, 0x522, PCI_ANY_ID, PCI_ANY_ID, 0, 0, G200_SE_A },
3333
{ PCI_VENDOR_ID_MATROX, 0x524, PCI_ANY_ID, PCI_ANY_ID, 0, 0, G200_SE_B },
3434
{ PCI_VENDOR_ID_MATROX, 0x530, PCI_ANY_ID, PCI_ANY_ID, 0, 0, G200_EV },

‎drivers/gpu/drm/qxl/qxl_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "qxl_object.h"
3939

4040
extern int qxl_max_ioctls;
41-
static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
41+
static const struct pci_device_id pciidlist[] = {
4242
{ 0x1b36, 0x100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8,
4343
0xffff00, 0 },
4444
{ 0x1b36, 0x100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_OTHER << 8,

‎drivers/infiniband/hw/qib/qib_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1222,7 +1222,7 @@ static int qib_init_one(struct pci_dev *, const struct pci_device_id *);
12221222
#define DRIVER_LOAD_MSG "Intel " QIB_DRV_NAME " loaded: "
12231223
#define PFX QIB_DRV_NAME ": "
12241224

1225-
static DEFINE_PCI_DEVICE_TABLE(qib_pci_tbl) = {
1225+
static const struct pci_device_id qib_pci_tbl[] = {
12261226
{ PCI_DEVICE(PCI_VENDOR_ID_PATHSCALE, PCI_DEVICE_ID_QLOGIC_IB_6120) },
12271227
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_IB_7220) },
12281228
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_IB_7322) },

‎drivers/infiniband/hw/usnic/usnic_ib_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ static struct usnic_ib_dev *usnic_ib_discover_pf(struct usnic_vnic *vnic)
490490

491491
/* Start of PCI section */
492492

493-
static DEFINE_PCI_DEVICE_TABLE(usnic_ib_pci_ids) = {
493+
static const struct pci_device_id usnic_ib_pci_ids[] = {
494494
{PCI_DEVICE(PCI_VENDOR_ID_CISCO, PCI_DEVICE_ID_CISCO_VIC_USPACE_NIC)},
495495
{0,}
496496
};

‎drivers/mmc/host/dw_mmc-pci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static int dw_mci_pci_resume(struct device *dev)
102102

103103
static SIMPLE_DEV_PM_OPS(dw_mci_pci_pmops, dw_mci_pci_suspend, dw_mci_pci_resume);
104104

105-
static DEFINE_PCI_DEVICE_TABLE(dw_mci_pci_id) = {
105+
static const struct pci_device_id dw_mci_pci_id[] = {
106106
{ PCI_DEVICE(SYNOPSYS_DW_MCI_VENDOR_ID, SYNOPSYS_DW_MCI_DEVICE_ID) },
107107
{}
108108
};

‎drivers/net/arcnet/com20020-pci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ static void com20020pci_remove(struct pci_dev *pdev)
144144
free_netdev(dev);
145145
}
146146

147-
static DEFINE_PCI_DEVICE_TABLE(com20020pci_id_table) = {
147+
static const struct pci_device_id com20020pci_id_table[] = {
148148
{ 0x1571, 0xa001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
149149
{ 0x1571, 0xa002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
150150
{ 0x1571, 0xa003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },

‎drivers/net/can/c_can/c_can_pci.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,8 @@ static struct c_can_pci_data c_can_pch = {
270270
PCI_DEVICE(_vend, _dev), \
271271
.driver_data = (unsigned long)&_driverdata, \
272272
}
273-
static DEFINE_PCI_DEVICE_TABLE(c_can_pci_tbl) = {
273+
274+
static const struct pci_device_id c_can_pci_tbl[] = {
274275
C_CAN_ID(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_CAN,
275276
c_can_sta2x11),
276277
C_CAN_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PCH_CAN,

‎drivers/net/can/pch_can.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ static const struct can_bittiming_const pch_can_bittiming_const = {
194194
.brp_inc = 1,
195195
};
196196

197-
static DEFINE_PCI_DEVICE_TABLE(pch_pci_tbl) = {
197+
static const struct pci_device_id pch_pci_tbl[] = {
198198
{PCI_VENDOR_ID_INTEL, 0x8818, PCI_ANY_ID, PCI_ANY_ID,},
199199
{0,}
200200
};

‎drivers/net/can/sja1000/ems_pci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ struct ems_pci_card {
101101

102102
#define EMS_PCI_BASE_SIZE 4096 /* size of controller area */
103103

104-
static DEFINE_PCI_DEVICE_TABLE(ems_pci_tbl) = {
104+
static const struct pci_device_id ems_pci_tbl[] = {
105105
/* CPC-PCI v1 */
106106
{PCI_VENDOR_ID_SIEMENS, 0x2104, PCI_ANY_ID, PCI_ANY_ID,},
107107
/* CPC-PCI v2 */

‎drivers/net/can/sja1000/kvaser_pci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ struct kvaser_pci {
107107
#define KVASER_PCI_VENDOR_ID2 0x1a07 /* the PCI device and vendor IDs */
108108
#define KVASER_PCI_DEVICE_ID2 0x0008
109109

110-
static DEFINE_PCI_DEVICE_TABLE(kvaser_pci_tbl) = {
110+
static const struct pci_device_id kvaser_pci_tbl[] = {
111111
{KVASER_PCI_VENDOR_ID1, KVASER_PCI_DEVICE_ID1, PCI_ANY_ID, PCI_ANY_ID,},
112112
{KVASER_PCI_VENDOR_ID2, KVASER_PCI_DEVICE_ID2, PCI_ANY_ID, PCI_ANY_ID,},
113113
{ 0,}

‎drivers/net/can/sja1000/peak_pci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ static const u16 peak_pci_icr_masks[PEAK_PCI_CHAN_MAX] = {
7777
0x02, 0x01, 0x40, 0x80
7878
};
7979

80-
static DEFINE_PCI_DEVICE_TABLE(peak_pci_tbl) = {
80+
static const struct pci_device_id peak_pci_tbl[] = {
8181
{PEAK_PCI_VENDOR_ID, PEAK_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
8282
{PEAK_PCI_VENDOR_ID, PEAK_PCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
8383
{PEAK_PCI_VENDOR_ID, PEAK_MPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},

‎drivers/net/can/sja1000/plx_pci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ static struct plx_pci_card_info plx_pci_card_info_elcus = {
247247
/* based on PLX9030 */
248248
};
249249

250-
static DEFINE_PCI_DEVICE_TABLE(plx_pci_tbl) = {
250+
static const struct pci_device_id plx_pci_tbl[] = {
251251
{
252252
/* Adlink PCI-7841/cPCI-7841 */
253253
ADLINK_PCI_VENDOR_ID, ADLINK_PCI_DEVICE_ID,

‎drivers/net/ethernet/3com/3c59x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ static struct vortex_chip_info {
375375
};
376376

377377

378-
static DEFINE_PCI_DEVICE_TABLE(vortex_pci_tbl) = {
378+
static const struct pci_device_id vortex_pci_tbl[] = {
379379
{ 0x10B7, 0x5900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C590 },
380380
{ 0x10B7, 0x5920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C592 },
381381
{ 0x10B7, 0x5970, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C597 },

‎drivers/net/ethernet/3com/typhoon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ static struct typhoon_card_info typhoon_card_info[] = {
203203
* bit 8 indicates if this is a (0) copper or (1) fiber card
204204
* bits 12-16 indicate card type: (0) client and (1) server
205205
*/
206-
static DEFINE_PCI_DEVICE_TABLE(typhoon_pci_tbl) = {
206+
static const struct pci_device_id typhoon_pci_tbl[] = {
207207
{ PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990,
208208
PCI_ANY_ID, PCI_ANY_ID, 0, 0,TYPHOON_TX },
209209
{ PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990_TX_95,

‎drivers/net/ethernet/8390/ne2k-pci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static struct {
135135
};
136136

137137

138-
static DEFINE_PCI_DEVICE_TABLE(ne2k_pci_tbl) = {
138+
static const struct pci_device_id ne2k_pci_tbl[] = {
139139
{ 0x10ec, 0x8029, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_RealTek_RTL_8029 },
140140
{ 0x1050, 0x0940, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Winbond_89C940 },
141141
{ 0x11f6, 0x1401, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Compex_RL2000 },

‎drivers/net/ethernet/adaptec/starfire.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ enum chipset {
285285
CH_6915 = 0,
286286
};
287287

288-
static DEFINE_PCI_DEVICE_TABLE(starfire_pci_tbl) = {
288+
static const struct pci_device_id starfire_pci_tbl[] = {
289289
{ PCI_VDEVICE(ADAPTEC, 0x6915), CH_6915 },
290290
{ 0, }
291291
};

‎drivers/net/ethernet/alteon/acenic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
#define PCI_DEVICE_ID_SGI_ACENIC 0x0009
132132
#endif
133133

134-
static DEFINE_PCI_DEVICE_TABLE(acenic_pci_tbl) = {
134+
static const struct pci_device_id acenic_pci_tbl[] = {
135135
{ PCI_VENDOR_ID_ALTEON, PCI_DEVICE_ID_ALTEON_ACENIC_FIBRE,
136136
PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_ETHERNET << 8, 0xffff00, },
137137
{ PCI_VENDOR_ID_ALTEON, PCI_DEVICE_ID_ALTEON_ACENIC_COPPER,

‎drivers/net/ethernet/amd/pcnet32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static const char *const version =
6161
/*
6262
* PCI device identifiers for "new style" Linux PCI Device Drivers
6363
*/
64-
static DEFINE_PCI_DEVICE_TABLE(pcnet32_pci_tbl) = {
64+
static const struct pci_device_id pcnet32_pci_tbl[] = {
6565
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE_HOME), },
6666
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE), },
6767

‎drivers/net/ethernet/atheros/alx/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1527,7 +1527,7 @@ static const struct pci_error_handlers alx_err_handlers = {
15271527
.resume = alx_pci_error_resume,
15281528
};
15291529

1530-
static DEFINE_PCI_DEVICE_TABLE(alx_pci_tbl) = {
1530+
static const struct pci_device_id alx_pci_tbl[] = {
15311531
{ PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_AR8161),
15321532
.driver_data = ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG },
15331533
{ PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_E2200),

‎drivers/net/ethernet/atheros/atl1c/atl1c_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ char atl1c_driver_version[] = ATL1C_DRV_VERSION;
3434
* { Vendor ID, Device ID, SubVendor ID, SubDevice ID,
3535
* Class, Class Mask, private data (not used) }
3636
*/
37-
static DEFINE_PCI_DEVICE_TABLE(atl1c_pci_tbl) = {
37+
static const struct pci_device_id atl1c_pci_tbl[] = {
3838
{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1C)},
3939
{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L2C)},
4040
{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B)},

‎drivers/net/ethernet/atheros/atl1e/atl1e_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ char atl1e_driver_version[] = DRV_VERSION;
3535
* { Vendor ID, Device ID, SubVendor ID, SubDevice ID,
3636
* Class, Class Mask, private data (not used) }
3737
*/
38-
static DEFINE_PCI_DEVICE_TABLE(atl1e_pci_tbl) = {
38+
static const struct pci_device_id atl1e_pci_tbl[] = {
3939
{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1E)},
4040
{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, 0x1066)},
4141
/* required last entry */

‎drivers/net/ethernet/atheros/atlx/atl1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ static void atl1_check_options(struct atl1_adapter *adapter)
235235
/*
236236
* atl1_pci_tbl - PCI Device ID Table
237237
*/
238-
static DEFINE_PCI_DEVICE_TABLE(atl1_pci_tbl) = {
238+
static const struct pci_device_id atl1_pci_tbl[] = {
239239
{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1)},
240240
/* required last entry */
241241
{0,}

‎drivers/net/ethernet/atheros/atlx/atl2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ MODULE_VERSION(ATL2_DRV_VERSION);
6565
/*
6666
* atl2_pci_tbl - PCI Device ID Table
6767
*/
68-
static DEFINE_PCI_DEVICE_TABLE(atl2_pci_tbl) = {
68+
static const struct pci_device_id atl2_pci_tbl[] = {
6969
{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L2)},
7070
/* required last entry */
7171
{0,}

‎drivers/net/ethernet/broadcom/b44.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ MODULE_PARM_DESC(b44_debug, "B44 bitmapped debugging message enable value");
105105

106106

107107
#ifdef CONFIG_B44_PCI
108-
static DEFINE_PCI_DEVICE_TABLE(b44_pci_tbl) = {
108+
static const struct pci_device_id b44_pci_tbl[] = {
109109
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401) },
110110
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B0) },
111111
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B1) },

‎drivers/net/ethernet/broadcom/bnx2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ static struct {
120120
{ "Broadcom NetXtreme II BCM5716 1000Base-SX" },
121121
};
122122

123-
static DEFINE_PCI_DEVICE_TABLE(bnx2_pci_tbl) = {
123+
static const struct pci_device_id bnx2_pci_tbl[] = {
124124
{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706,
125125
PCI_VENDOR_ID_HP, 0x3101, 0, 0, NC370T },
126126
{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706,

‎drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ static struct {
249249
#define PCI_DEVICE_ID_NX2_57811_VF CHIP_NUM_57811_VF
250250
#endif
251251

252-
static DEFINE_PCI_DEVICE_TABLE(bnx2x_pci_tbl) = {
252+
static const struct pci_device_id bnx2x_pci_tbl[] = {
253253
{ PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57710), BCM57710 },
254254
{ PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57711), BCM57711 },
255255
{ PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57711E), BCM57711E },

‎drivers/net/ethernet/broadcom/tg3.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ MODULE_PARM_DESC(tg3_debug, "Tigon3 bitmapped debugging message enable value");
237237
#define TG3_DRV_DATA_FLAG_10_100_ONLY 0x0001
238238
#define TG3_DRV_DATA_FLAG_5705_10_100 0x0002
239239

240-
static DEFINE_PCI_DEVICE_TABLE(tg3_pci_tbl) = {
240+
static const struct pci_device_id tg3_pci_tbl[] = {
241241
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5700)},
242242
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5701)},
243243
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5702)},
@@ -15927,7 +15927,7 @@ static inline u32 tg3_rx_ret_ring_size(struct tg3 *tp)
1592715927
return TG3_RX_RET_MAX_SIZE_5705;
1592815928
}
1592915929

15930-
static DEFINE_PCI_DEVICE_TABLE(tg3_write_reorder_chipsets) = {
15930+
static const struct pci_device_id tg3_write_reorder_chipsets[] = {
1593115931
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_FE_GATE_700C) },
1593215932
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE) },
1593315933
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8385_0) },
@@ -17186,7 +17186,7 @@ static int tg3_do_test_dma(struct tg3 *tp, u32 *buf, dma_addr_t buf_dma,
1718617186

1718717187
#define TEST_BUFFER_SIZE 0x2000
1718817188

17189-
static DEFINE_PCI_DEVICE_TABLE(tg3_dma_wait_state_chipsets) = {
17189+
static const struct pci_device_id tg3_dma_wait_state_chipsets[] = {
1719017190
{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_PCI15) },
1719117191
{ },
1719217192
};

0 commit comments

Comments
 (0)