staging: remove DEFINE_PCI_DEVICE_TABLE macro

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

staging: remove DEFINE_PCI_DEVICE_TABLE macro

Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
is not preferred.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jingoo Han and committed by

Greg Kroah-Hartman 12 years ago 41e043fc 06749f19

+65 -65

65 changed files

expand all collapse all

drivers

staging

comedi

drivers

8255_pci.c

addi_apci_035.c

addi_apci_1032.c

addi_apci_1500.c

addi_apci_1516.c

addi_apci_1564.c

addi_apci_16xx.c

addi_apci_2032.c

addi_apci_2200.c

addi_apci_3120.c

addi_apci_3200.c

addi_apci_3501.c

addi_apci_3xxx.c

adl_pci6208.c

adl_pci7x3x.c

adl_pci8164.c

adl_pci9111.c

adl_pci9118.c

adv_pci1710.c

adv_pci1723.c

adv_pci1724.c

adv_pci_dio.c

amplc_dio200_pci.c

amplc_pc236.c

amplc_pci224.c

amplc_pci230.c

amplc_pci263.c

cb_pcidas.c

cb_pcidas64.c

cb_pcidda.c

cb_pcimdas.c

cb_pcimdda.c

contec_pci_dio.c

daqboard2000.c

das08_pci.c

dt3000.c

dyna_pci10xx.c

gsc_hpdi.c

icp_multi.c

jr3_pci.c

ke_counter.c

me4000.c

me_daq.c

ni_6527.c

ni_65xx.c

ni_660x.c

ni_670x.c

ni_labpc_pci.c

ni_pcidio.c

ni_pcimio.c

rtd520.c

s626.c

skel.c

crystalhd

crystalhd_lnx.c

dwc2

pci.c

et131x

et131x.c

media

dt3155v4l

dt3155v4l.c

solo6x10

solo6x10-core.c

phison

phison.c

sep

sep_main.c

slicoss

slicoss.c

sm7xxfb

sm7xxfb.c

vt6655

device_main.c

xgifb

XGI_main.h

xillybus

xillybus_pcie.c

+1 -1

drivers/staging/comedi/drivers/8255_pci.c

reviewed

··· 257 257 return comedi_pci_auto_config(dev, &pci_8255_driver, id->driver_data); 258 258 } 259 259 260 260 - static DEFINE_PCI_DEVICE_TABLE(pci_8255_pci_table) = { 260 260 + static const struct pci_device_id pci_8255_pci_table[] = { 261 261 { PCI_VDEVICE(ADLINK, 0x7224), BOARD_ADLINK_PCI7224 }, 262 262 { PCI_VDEVICE(ADLINK, 0x7248), BOARD_ADLINK_PCI7248 }, 263 263 { PCI_VDEVICE(ADLINK, 0x7296), BOARD_ADLINK_PCI7296 },

+1 -1

drivers/staging/comedi/drivers/addi_apci_035.c

reviewed

··· 58 58 return comedi_pci_auto_config(dev, &apci035_driver, id->driver_data); 59 59 } 60 60 61 61 - static DEFINE_PCI_DEVICE_TABLE(apci035_pci_table) = { 61 61 + static const struct pci_device_id apci035_pci_table[] = { 62 62 { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x0300) }, 63 63 { 0 } 64 64 };

+1 -1

drivers/staging/comedi/drivers/addi_apci_1032.c

reviewed

··· 364 364 return comedi_pci_auto_config(dev, &apci1032_driver, id->driver_data); 365 365 } 366 366 367 367 - static DEFINE_PCI_DEVICE_TABLE(apci1032_pci_table) = { 367 367 + static const struct pci_device_id apci1032_pci_table[] = { 368 368 { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1003) }, 369 369 { 0 } 370 370 };

+1 -1

drivers/staging/comedi/drivers/addi_apci_1500.c

reviewed

··· 57 57 return comedi_pci_auto_config(dev, &apci1500_driver, id->driver_data); 58 58 } 59 59 60 60 - static DEFINE_PCI_DEVICE_TABLE(apci1500_pci_table) = { 60 60 + static const struct pci_device_id apci1500_pci_table[] = { 61 61 { PCI_DEVICE(PCI_VENDOR_ID_AMCC, 0x80fc) }, 62 62 { 0 } 63 63 };

+1 -1

drivers/staging/comedi/drivers/addi_apci_1516.c

reviewed

··· 206 206 return comedi_pci_auto_config(dev, &apci1516_driver, id->driver_data); 207 207 } 208 208 209 209 - static DEFINE_PCI_DEVICE_TABLE(apci1516_pci_table) = { 209 209 + static const struct pci_device_id apci1516_pci_table[] = { 210 210 { PCI_VDEVICE(ADDIDATA, 0x1000), BOARD_APCI1016 }, 211 211 { PCI_VDEVICE(ADDIDATA, 0x1001), BOARD_APCI1516 }, 212 212 { PCI_VDEVICE(ADDIDATA, 0x1002), BOARD_APCI2016 },

+1 -1

drivers/staging/comedi/drivers/addi_apci_1564.c

reviewed

··· 55 55 return comedi_pci_auto_config(dev, &apci1564_driver, id->driver_data); 56 56 } 57 57 58 58 - static DEFINE_PCI_DEVICE_TABLE(apci1564_pci_table) = { 58 58 + static const struct pci_device_id apci1564_pci_table[] = { 59 59 { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1006) }, 60 60 { 0 } 61 61 };

+1 -1

drivers/staging/comedi/drivers/addi_apci_16xx.c

reviewed

··· 168 168 return comedi_pci_auto_config(dev, &apci16xx_driver, id->driver_data); 169 169 } 170 170 171 171 - static DEFINE_PCI_DEVICE_TABLE(apci16xx_pci_table) = { 171 171 + static const struct pci_device_id apci16xx_pci_table[] = { 172 172 { PCI_VDEVICE(ADDIDATA, 0x1009), BOARD_APCI1648 }, 173 173 { PCI_VDEVICE(ADDIDATA, 0x100a), BOARD_APCI1696 }, 174 174 { 0 }

+1 -1

drivers/staging/comedi/drivers/addi_apci_2032.c

reviewed

··· 359 359 return comedi_pci_auto_config(dev, &apci2032_driver, id->driver_data); 360 360 } 361 361 362 362 - static DEFINE_PCI_DEVICE_TABLE(apci2032_pci_table) = { 362 362 + static const struct pci_device_id apci2032_pci_table[] = { 363 363 { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1004) }, 364 364 { 0 } 365 365 };

+1 -1

drivers/staging/comedi/drivers/addi_apci_2200.c

reviewed

··· 134 134 return comedi_pci_auto_config(dev, &apci2200_driver, id->driver_data); 135 135 } 136 136 137 137 - static DEFINE_PCI_DEVICE_TABLE(apci2200_pci_table) = { 137 137 + static const struct pci_device_id apci2200_pci_table[] = { 138 138 { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1005) }, 139 139 { 0 } 140 140 };

+1 -1

drivers/staging/comedi/drivers/addi_apci_3120.c

reviewed

··· 230 230 return comedi_pci_auto_config(dev, &apci3120_driver, id->driver_data); 231 231 } 232 232 233 233 - static DEFINE_PCI_DEVICE_TABLE(apci3120_pci_table) = { 233 233 + static const struct pci_device_id apci3120_pci_table[] = { 234 234 { PCI_VDEVICE(AMCC, 0x818d), BOARD_APCI3120 }, 235 235 { PCI_VDEVICE(AMCC, 0x828d), BOARD_APCI3001 }, 236 236 { 0 }

+1 -1

drivers/staging/comedi/drivers/addi_apci_3200.c

reviewed

··· 109 109 return comedi_pci_auto_config(dev, &apci3200_driver, id->driver_data); 110 110 } 111 111 112 112 - static DEFINE_PCI_DEVICE_TABLE(apci3200_pci_table) = { 112 112 + static const struct pci_device_id apci3200_pci_table[] = { 113 113 { PCI_VDEVICE(ADDIDATA, 0x3000), BOARD_APCI3200 }, 114 114 { PCI_VDEVICE(ADDIDATA, 0x3007), BOARD_APCI3300 }, 115 115 { 0 }

+1 -1

drivers/staging/comedi/drivers/addi_apci_3501.c

reviewed

··· 428 428 return comedi_pci_auto_config(dev, &apci3501_driver, id->driver_data); 429 429 } 430 430 431 431 - static DEFINE_PCI_DEVICE_TABLE(apci3501_pci_table) = { 431 431 + static const struct pci_device_id apci3501_pci_table[] = { 432 432 { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3001) }, 433 433 { 0 } 434 434 };

+1 -1

drivers/staging/comedi/drivers/addi_apci_3xxx.c

reviewed

··· 915 915 return comedi_pci_auto_config(dev, &apci3xxx_driver, id->driver_data); 916 916 } 917 917 918 918 - static DEFINE_PCI_DEVICE_TABLE(apci3xxx_pci_table) = { 918 918 + static const struct pci_device_id apci3xxx_pci_table[] = { 919 919 { PCI_VDEVICE(ADDIDATA, 0x3010), BOARD_APCI3000_16 }, 920 920 { PCI_VDEVICE(ADDIDATA, 0x300f), BOARD_APCI3000_8 }, 921 921 { PCI_VDEVICE(ADDIDATA, 0x300e), BOARD_APCI3000_4 },

+1 -1

drivers/staging/comedi/drivers/adl_pci6208.c

reviewed

··· 242 242 id->driver_data); 243 243 } 244 244 245 245 - static DEFINE_PCI_DEVICE_TABLE(adl_pci6208_pci_table) = { 245 245 + static const struct pci_device_id adl_pci6208_pci_table[] = { 246 246 { PCI_VDEVICE(ADLINK, 0x6208), BOARD_PCI6208 }, 247 247 { PCI_VDEVICE(ADLINK, 0x6216), BOARD_PCI6216 }, 248 248 { 0 }

+1 -1

drivers/staging/comedi/drivers/adl_pci7x3x.c

reviewed

··· 259 259 id->driver_data); 260 260 } 261 261 262 262 - static DEFINE_PCI_DEVICE_TABLE(adl_pci7x3x_pci_table) = { 262 262 + static const struct pci_device_id adl_pci7x3x_pci_table[] = { 263 263 { PCI_VDEVICE(ADLINK, 0x7230), BOARD_PCI7230 }, 264 264 { PCI_VDEVICE(ADLINK, 0x7233), BOARD_PCI7233 }, 265 265 { PCI_VDEVICE(ADLINK, 0x7234), BOARD_PCI7234 },

+1 -1

drivers/staging/comedi/drivers/adl_pci8164.c

reviewed

··· 145 145 id->driver_data); 146 146 } 147 147 148 148 - static DEFINE_PCI_DEVICE_TABLE(adl_pci8164_pci_table) = { 148 148 + static const struct pci_device_id adl_pci8164_pci_table[] = { 149 149 { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, 0x8164) }, 150 150 { 0 } 151 151 };

+1 -1

drivers/staging/comedi/drivers/adl_pci9111.c

reviewed

··· 938 938 id->driver_data); 939 939 } 940 940 941 941 - static DEFINE_PCI_DEVICE_TABLE(pci9111_pci_table) = { 941 941 + static const struct pci_device_id pci9111_pci_table[] = { 942 942 { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI9111_HR_DEVICE_ID) }, 943 943 /* { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI9111_HG_DEVICE_ID) }, */ 944 944 { 0 }

+1 -1

drivers/staging/comedi/drivers/adl_pci9118.c

reviewed

··· 2217 2217 id->driver_data); 2218 2218 } 2219 2219 2220 2220 - static DEFINE_PCI_DEVICE_TABLE(adl_pci9118_pci_table) = { 2220 2220 + static const struct pci_device_id adl_pci9118_pci_table[] = { 2221 2221 { PCI_DEVICE(PCI_VENDOR_ID_AMCC, 0x80d9) }, 2222 2222 { 0 } 2223 2223 };

+1 -1

drivers/staging/comedi/drivers/adv_pci1710.c

reviewed

··· 1374 1374 id->driver_data); 1375 1375 } 1376 1376 1377 1377 - static DEFINE_PCI_DEVICE_TABLE(adv_pci1710_pci_table) = { 1377 1377 + static const struct pci_device_id adv_pci1710_pci_table[] = { 1378 1378 { 1379 1379 PCI_DEVICE_SUB(PCI_VENDOR_ID_ADVANTECH, 0x1710, 1380 1380 PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050),

+1 -1

drivers/staging/comedi/drivers/adv_pci1723.c

reviewed

··· 306 306 id->driver_data); 307 307 } 308 308 309 309 - static DEFINE_PCI_DEVICE_TABLE(adv_pci1723_pci_table) = { 309 309 + static const struct pci_device_id adv_pci1723_pci_table[] = { 310 310 { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1723) }, 311 311 { 0 } 312 312 };

+1 -1

drivers/staging/comedi/drivers/adv_pci1724.c

reviewed

··· 381 381 id->driver_data); 382 382 } 383 383 384 384 - static DEFINE_PCI_DEVICE_TABLE(adv_pci1724_pci_table) = { 384 384 + static const struct pci_device_id adv_pci1724_pci_table[] = { 385 385 { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1724) }, 386 386 { 0 } 387 387 };

+1 -1

drivers/staging/comedi/drivers/adv_pci_dio.c

reviewed

··· 1188 1188 return comedi_pci_auto_config(dev, &adv_pci_dio_driver, cardtype); 1189 1189 } 1190 1190 1191 1191 - static DEFINE_PCI_DEVICE_TABLE(adv_pci_dio_pci_table) = { 1191 1191 + static const struct pci_device_id adv_pci_dio_pci_table[] = { 1192 1192 { PCI_VDEVICE(ADVANTECH, 0x1730), TYPE_PCI1730 }, 1193 1193 { PCI_VDEVICE(ADVANTECH, 0x1733), TYPE_PCI1733 }, 1194 1194 { PCI_VDEVICE(ADVANTECH, 0x1734), TYPE_PCI1734 },

+1 -1

drivers/staging/comedi/drivers/amplc_dio200_pci.c

reviewed

··· 439 439 .detach = dio200_pci_detach, 440 440 }; 441 441 442 442 - static DEFINE_PCI_DEVICE_TABLE(dio200_pci_table) = { 442 442 + static const struct pci_device_id dio200_pci_table[] = { 443 443 { 444 444 PCI_VDEVICE(AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI215), 445 445 pci215_model

+1 -1

drivers/staging/comedi/drivers/amplc_pc236.c

reviewed

··· 567 567 }; 568 568 569 569 #if DO_PCI 570 570 - static DEFINE_PCI_DEVICE_TABLE(pc236_pci_table) = { 570 570 + static const struct pci_device_id pc236_pci_table[] = { 571 571 { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI236) }, 572 572 {0} 573 573 };

+1 -1

drivers/staging/comedi/drivers/amplc_pci224.c

reviewed

··· 1496 1496 id->driver_data); 1497 1497 } 1498 1498 1499 1499 - static DEFINE_PCI_DEVICE_TABLE(amplc_pci224_pci_table) = { 1499 1499 + static const struct pci_device_id amplc_pci224_pci_table[] = { 1500 1500 { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI224) }, 1501 1501 { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI234) }, 1502 1502 { 0 }

+1 -1

drivers/staging/comedi/drivers/amplc_pci230.c

reviewed

··· 2852 2852 id->driver_data); 2853 2853 } 2854 2854 2855 2855 - static DEFINE_PCI_DEVICE_TABLE(amplc_pci230_pci_table) = { 2855 2855 + static const struct pci_device_id amplc_pci230_pci_table[] = { 2856 2856 { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI230) }, 2857 2857 { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI260) }, 2858 2858 { 0 }

+1 -1

drivers/staging/comedi/drivers/amplc_pci263.c

reviewed

··· 96 96 .detach = comedi_pci_disable, 97 97 }; 98 98 99 99 - static DEFINE_PCI_DEVICE_TABLE(pci263_pci_table) = { 99 99 + static const struct pci_device_id pci263_pci_table[] = { 100 100 { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI263) }, 101 101 {0} 102 102 };

+1 -1

drivers/staging/comedi/drivers/cb_pcidas.c

reviewed

··· 1614 1614 id->driver_data); 1615 1615 } 1616 1616 1617 1617 - static DEFINE_PCI_DEVICE_TABLE(cb_pcidas_pci_table) = { 1617 1617 + static const struct pci_device_id cb_pcidas_pci_table[] = { 1618 1618 { PCI_VDEVICE(CB, 0x0001), BOARD_PCIDAS1602_16 }, 1619 1619 { PCI_VDEVICE(CB, 0x000f), BOARD_PCIDAS1200 }, 1620 1620 { PCI_VDEVICE(CB, 0x0010), BOARD_PCIDAS1602_12 },

+1 -1

drivers/staging/comedi/drivers/cb_pcidas64.c

reviewed

··· 4041 4041 id->driver_data); 4042 4042 } 4043 4043 4044 4044 - static DEFINE_PCI_DEVICE_TABLE(cb_pcidas64_pci_table) = { 4044 4044 + static const struct pci_device_id cb_pcidas64_pci_table[] = { 4045 4045 { PCI_VDEVICE(CB, 0x001d), BOARD_PCIDAS6402_16 }, 4046 4046 { PCI_VDEVICE(CB, 0x001e), BOARD_PCIDAS6402_12 }, 4047 4047 { PCI_VDEVICE(CB, 0x0035), BOARD_PCIDAS64_M1_16 },

+1 -1

drivers/staging/comedi/drivers/cb_pcidda.c

reviewed

··· 407 407 id->driver_data); 408 408 } 409 409 410 410 - static DEFINE_PCI_DEVICE_TABLE(cb_pcidda_pci_table) = { 410 410 + static const struct pci_device_id cb_pcidda_pci_table[] = { 411 411 { PCI_VDEVICE(CB, 0x0020), BOARD_DDA02_12 }, 412 412 { PCI_VDEVICE(CB, 0x0021), BOARD_DDA04_12 }, 413 413 { PCI_VDEVICE(CB, 0x0022), BOARD_DDA08_12 },

+1 -1

drivers/staging/comedi/drivers/cb_pcimdas.c

reviewed

··· 285 285 id->driver_data); 286 286 } 287 287 288 288 - static DEFINE_PCI_DEVICE_TABLE(cb_pcimdas_pci_table) = { 288 288 + static const struct pci_device_id cb_pcimdas_pci_table[] = { 289 289 { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0056) }, 290 290 { 0 } 291 291 };

+1 -1

drivers/staging/comedi/drivers/cb_pcimdda.c

reviewed

··· 206 206 id->driver_data); 207 207 } 208 208 209 209 - static DEFINE_PCI_DEVICE_TABLE(cb_pcimdda_pci_table) = { 209 209 + static const struct pci_device_id cb_pcimdda_pci_table[] = { 210 210 { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_ID_PCIM_DDA06_16) }, 211 211 { 0 } 212 212 };

+1 -1

drivers/staging/comedi/drivers/contec_pci_dio.c

reviewed

··· 111 111 id->driver_data); 112 112 } 113 113 114 114 - static DEFINE_PCI_DEVICE_TABLE(contec_pci_dio_pci_table) = { 114 114 + static const struct pci_device_id contec_pci_dio_pci_table[] = { 115 115 { PCI_DEVICE(PCI_VENDOR_ID_CONTEC, PCI_DEVICE_ID_PIO1616L) }, 116 116 { 0 } 117 117 };

+1 -1

drivers/staging/comedi/drivers/daqboard2000.c

reviewed

··· 772 772 id->driver_data); 773 773 } 774 774 775 775 - static DEFINE_PCI_DEVICE_TABLE(daqboard2000_pci_table) = { 775 775 + static const struct pci_device_id daqboard2000_pci_table[] = { 776 776 { PCI_DEVICE(PCI_VENDOR_ID_IOTECH, 0x0409) }, 777 777 { 0 } 778 778 };

+1 -1

drivers/staging/comedi/drivers/das08_pci.c

reviewed

··· 89 89 id->driver_data); 90 90 } 91 91 92 92 - static DEFINE_PCI_DEVICE_TABLE(das08_pci_table) = { 92 92 + static const struct pci_device_id das08_pci_table[] = { 93 93 { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_PCIDAS08) }, 94 94 { 0 } 95 95 };

+1 -1

drivers/staging/comedi/drivers/dt3000.c

reviewed

··· 795 795 return comedi_pci_auto_config(dev, &dt3000_driver, id->driver_data); 796 796 } 797 797 798 798 - static DEFINE_PCI_DEVICE_TABLE(dt3000_pci_table) = { 798 798 + static const struct pci_device_id dt3000_pci_table[] = { 799 799 { PCI_VDEVICE(DT, 0x0022), BOARD_DT3001 }, 800 800 { PCI_VDEVICE(DT, 0x0023), BOARD_DT3002 }, 801 801 { PCI_VDEVICE(DT, 0x0024), BOARD_DT3003 },

+1 -1

drivers/staging/comedi/drivers/dyna_pci10xx.c

reviewed

··· 259 259 id->driver_data); 260 260 } 261 261 262 262 - static DEFINE_PCI_DEVICE_TABLE(dyna_pci10xx_pci_table) = { 262 262 + static const struct pci_device_id dyna_pci10xx_pci_table[] = { 263 263 { PCI_DEVICE(PCI_VENDOR_ID_PLX, 0x1050) }, 264 264 { 0 } 265 265 };

+1 -1

drivers/staging/comedi/drivers/gsc_hpdi.c

reviewed

··· 836 836 return comedi_pci_auto_config(dev, &gsc_hpdi_driver, id->driver_data); 837 837 } 838 838 839 839 - static DEFINE_PCI_DEVICE_TABLE(gsc_hpdi_pci_table) = { 839 839 + static const struct pci_device_id gsc_hpdi_pci_table[] = { 840 840 { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9080, PCI_VENDOR_ID_PLX, 841 841 0x2400, 0, 0, 0}, 842 842 { 0 }

+1 -1

drivers/staging/comedi/drivers/icp_multi.c

reviewed

··· 597 597 return comedi_pci_auto_config(dev, &icp_multi_driver, id->driver_data); 598 598 } 599 599 600 600 - static DEFINE_PCI_DEVICE_TABLE(icp_multi_pci_table) = { 600 600 + static const struct pci_device_id icp_multi_pci_table[] = { 601 601 { PCI_DEVICE(PCI_VENDOR_ID_ICP, PCI_DEVICE_ID_ICP_MULTI) }, 602 602 { 0 } 603 603 };

+1 -1

drivers/staging/comedi/drivers/jr3_pci.c

reviewed

··· 807 807 return comedi_pci_auto_config(dev, &jr3_pci_driver, id->driver_data); 808 808 } 809 809 810 810 - static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = { 810 810 + static const struct pci_device_id jr3_pci_pci_table[] = { 811 811 { PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL) }, 812 812 { PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL_NEW) }, 813 813 { PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_2_CHANNEL) },

+1 -1

drivers/staging/comedi/drivers/ke_counter.c

reviewed

··· 139 139 id->driver_data); 140 140 } 141 141 142 142 - static DEFINE_PCI_DEVICE_TABLE(ke_counter_pci_table) = { 142 142 + static const struct pci_device_id ke_counter_pci_table[] = { 143 143 { PCI_DEVICE(PCI_VENDOR_ID_KOLTER, CNT_CARD_DEVICE_ID) }, 144 144 { 0 } 145 145 };

+1 -1

drivers/staging/comedi/drivers/me4000.c

reviewed

··· 1635 1635 return comedi_pci_auto_config(dev, &me4000_driver, id->driver_data); 1636 1636 } 1637 1637 1638 1638 - static DEFINE_PCI_DEVICE_TABLE(me4000_pci_table) = { 1638 1638 + static const struct pci_device_id me4000_pci_table[] = { 1639 1639 { PCI_VDEVICE(MEILHAUS, 0x4650), BOARD_ME4650 }, 1640 1640 { PCI_VDEVICE(MEILHAUS, 0x4660), BOARD_ME4660 }, 1641 1641 { PCI_VDEVICE(MEILHAUS, 0x4661), BOARD_ME4660I },

+1 -1

drivers/staging/comedi/drivers/me_daq.c

reviewed

··· 576 576 return comedi_pci_auto_config(dev, &me_daq_driver, id->driver_data); 577 577 } 578 578 579 579 - static DEFINE_PCI_DEVICE_TABLE(me_daq_pci_table) = { 579 579 + static const struct pci_device_id me_daq_pci_table[] = { 580 580 { PCI_VDEVICE(MEILHAUS, 0x2600), BOARD_ME2600 }, 581 581 { PCI_VDEVICE(MEILHAUS, 0x2000), BOARD_ME2000 }, 582 582 { 0 }

+1 -1

drivers/staging/comedi/drivers/ni_6527.c

reviewed

··· 455 455 return comedi_pci_auto_config(dev, &ni6527_driver, id->driver_data); 456 456 } 457 457 458 458 - static DEFINE_PCI_DEVICE_TABLE(ni6527_pci_table) = { 458 458 + static const struct pci_device_id ni6527_pci_table[] = { 459 459 { PCI_VDEVICE(NI, 0x2b10), BOARD_PXI6527 }, 460 460 { PCI_VDEVICE(NI, 0x2b20), BOARD_PCI6527 }, 461 461 { 0 }

+1 -1

drivers/staging/comedi/drivers/ni_65xx.c

reviewed

··· 738 738 return comedi_pci_auto_config(dev, &ni_65xx_driver, id->driver_data); 739 739 } 740 740 741 741 - static DEFINE_PCI_DEVICE_TABLE(ni_65xx_pci_table) = { 741 741 + static const struct pci_device_id ni_65xx_pci_table[] = { 742 742 { PCI_VDEVICE(NI, 0x1710), BOARD_PXI6509 }, 743 743 { PCI_VDEVICE(NI, 0x7085), BOARD_PCI6509 }, 744 744 { PCI_VDEVICE(NI, 0x7086), BOARD_PXI6528 },

+1 -1

drivers/staging/comedi/drivers/ni_660x.c

reviewed

··· 1320 1320 return comedi_pci_auto_config(dev, &ni_660x_driver, id->driver_data); 1321 1321 } 1322 1322 1323 1323 - static DEFINE_PCI_DEVICE_TABLE(ni_660x_pci_table) = { 1323 1323 + static const struct pci_device_id ni_660x_pci_table[] = { 1324 1324 { PCI_VDEVICE(NI, 0x1310), BOARD_PCI6602 }, 1325 1325 { PCI_VDEVICE(NI, 0x1360), BOARD_PXI6602 }, 1326 1326 { PCI_VDEVICE(NI, 0x2c60), BOARD_PCI6601 },

+1 -1

drivers/staging/comedi/drivers/ni_670x.c

reviewed

··· 282 282 return comedi_pci_auto_config(dev, &ni_670x_driver, id->driver_data); 283 283 } 284 284 285 285 - static DEFINE_PCI_DEVICE_TABLE(ni_670x_pci_table) = { 285 285 + static const struct pci_device_id ni_670x_pci_table[] = { 286 286 { PCI_VDEVICE(NI, 0x1290), BOARD_PCI6704 }, 287 287 { PCI_VDEVICE(NI, 0x1920), BOARD_PXI6704 }, 288 288 { PCI_VDEVICE(NI, 0x2c90), BOARD_PCI6703 },

+1 -1

drivers/staging/comedi/drivers/ni_labpc_pci.c

reviewed

··· 107 107 .detach = labpc_pci_detach, 108 108 }; 109 109 110 110 - static DEFINE_PCI_DEVICE_TABLE(labpc_pci_table) = { 110 110 + static const struct pci_device_id labpc_pci_table[] = { 111 111 { PCI_VDEVICE(NI, 0x161), BOARD_NI_PCI1200 }, 112 112 { 0 } 113 113 };

+1 -1

drivers/staging/comedi/drivers/ni_pcidio.c

reviewed

··· 1075 1075 return comedi_pci_auto_config(dev, &ni_pcidio_driver, id->driver_data); 1076 1076 } 1077 1077 1078 1078 - static DEFINE_PCI_DEVICE_TABLE(ni_pcidio_pci_table) = { 1078 1078 + static const struct pci_device_id ni_pcidio_pci_table[] = { 1079 1079 { PCI_VDEVICE(NI, 0x1150), BOARD_PCIDIO_32HS }, 1080 1080 { PCI_VDEVICE(NI, 0x12b0), BOARD_PCI6534 }, 1081 1081 { PCI_VDEVICE(NI, 0x1320), BOARD_PXI6533 },

+1 -1

drivers/staging/comedi/drivers/ni_pcimio.c

reviewed

··· 1637 1637 return comedi_pci_auto_config(dev, &ni_pcimio_driver, id->driver_data); 1638 1638 } 1639 1639 1640 1640 - static DEFINE_PCI_DEVICE_TABLE(ni_pcimio_pci_table) = { 1640 1640 + static const struct pci_device_id ni_pcimio_pci_table[] = { 1641 1641 { PCI_VDEVICE(NI, 0x0162), BOARD_PCIMIO_16XE_50 }, /* 0x1620? */ 1642 1642 { PCI_VDEVICE(NI, 0x1170), BOARD_PCIMIO_16XE_10 }, 1643 1643 { PCI_VDEVICE(NI, 0x1180), BOARD_PCIMIO_16E_1 },

+1 -1

drivers/staging/comedi/drivers/rtd520.c

reviewed

··· 1427 1427 return comedi_pci_auto_config(dev, &rtd520_driver, id->driver_data); 1428 1428 } 1429 1429 1430 1430 - static DEFINE_PCI_DEVICE_TABLE(rtd520_pci_table) = { 1430 1430 + static const struct pci_device_id rtd520_pci_table[] = { 1431 1431 { PCI_VDEVICE(RTD, 0x7520), BOARD_DM7520 }, 1432 1432 { PCI_VDEVICE(RTD, 0x4520), BOARD_PCI4520 }, 1433 1433 { 0 }

+1 -1

drivers/staging/comedi/drivers/s626.c

reviewed

··· 2965 2965 * also subvendor:subdevice ids, because otherwise it will conflict with 2966 2966 * Philips SAA7146 media/dvb based cards. 2967 2967 */ 2968 2968 - static DEFINE_PCI_DEVICE_TABLE(s626_pci_table) = { 2968 2968 + static const struct pci_device_id s626_pci_table[] = { 2969 2969 { PCI_DEVICE_SUB(PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, 2970 2970 0x6000, 0x0272) }, 2971 2971 { 0 }

+1 -1

drivers/staging/comedi/drivers/skel.c

reviewed

··· 698 698 * This is used by modprobe to translate PCI IDs to drivers. 699 699 * Should only be used for PCI and ISA-PnP devices 700 700 */ 701 701 - static DEFINE_PCI_DEVICE_TABLE(skel_pci_table) = { 701 701 + static const struct pci_device_id skel_pci_table[] = { 702 702 { PCI_VDEVICE(SKEL, 0x0100), BOARD_SKEL100 }, 703 703 { PCI_VDEVICE(SKEL, 0x0200), BOARD_SKEL200 }, 704 704 { 0 }

+1 -1

drivers/staging/crystalhd/crystalhd_lnx.c

reviewed

··· 703 703 } 704 704 #endif 705 705 706 706 - static DEFINE_PCI_DEVICE_TABLE(chd_dec_pci_id_table) = { 706 706 + static const struct pci_device_id chd_dec_pci_id_table[] = { 707 707 { PCI_VDEVICE(BROADCOM, 0x1612), 8 }, 708 708 { 0, }, 709 709 };

+1 -1

drivers/staging/dwc2/pci.c

reviewed

··· 152 152 return retval; 153 153 } 154 154 155 155 - static DEFINE_PCI_DEVICE_TABLE(dwc2_pci_ids) = { 155 155 + static const struct pci_device_id dwc2_pci_ids[] = { 156 156 { 157 157 PCI_DEVICE(PCI_VENDOR_ID_SYNOPSYS, PCI_PRODUCT_ID_HAPS_HSOTG), 158 158 },

+1 -1

drivers/staging/et131x/et131x.c

reviewed

··· 4930 4930 goto out; 4931 4931 } 4932 4932 4933 4933 - static DEFINE_PCI_DEVICE_TABLE(et131x_pci_table) = { 4933 4933 + static const struct pci_device_id et131x_pci_table[] = { 4934 4934 { PCI_VDEVICE(ATT, ET131X_PCI_DEVICE_ID_GIG), 0UL}, 4935 4935 { PCI_VDEVICE(ATT, ET131X_PCI_DEVICE_ID_FAST), 0UL}, 4936 4936 {0,}

+1 -1

drivers/staging/media/dt3155v4l/dt3155v4l.c

reviewed

··· 974 974 kfree(pd); 975 975 } 976 976 977 977 - static DEFINE_PCI_DEVICE_TABLE(pci_ids) = { 977 977 + static const struct pci_device_id pci_ids[] = { 978 978 { PCI_DEVICE(DT3155_VENDOR_ID, DT3155_DEVICE_ID) }, 979 979 { 0, /* zero marks the end */ }, 980 980 };

+1 -1

drivers/staging/media/solo6x10/solo6x10-core.c

reviewed

··· 669 669 free_solo_dev(solo_dev); 670 670 } 671 671 672 672 - static DEFINE_PCI_DEVICE_TABLE(solo_id_table) = { 672 672 + static const struct pci_device_id solo_id_table[] = { 673 673 /* 6010 based cards */ 674 674 { PCI_DEVICE(PCI_VENDOR_ID_SOFTLOGIC, PCI_DEVICE_ID_SOLO6010), 675 675 .driver_data = SOLO_DEV_6010 },

+1 -1

drivers/staging/phison/phison.c

reviewed

··· 69 69 return ret; 70 70 } 71 71 72 72 - static DEFINE_PCI_DEVICE_TABLE(phison_pci_tbl) = { 72 72 + static const struct pci_device_id phison_pci_tbl[] = { 73 73 { PCI_DEVICE(PCI_VENDOR_ID_PHISON, PCI_DEVICE_ID_PS5000), 74 74 PCI_CLASS_STORAGE_IDE << 8, 0xffff00, 0 }, 75 75 { 0, },

+1 -1

drivers/staging/sep/sep_main.c

reviewed

··· 4292 4292 } 4293 4293 4294 4294 /* Initialize struct pci_device_id for our driver */ 4295 4295 - static DEFINE_PCI_DEVICE_TABLE(sep_pci_id_tbl) = { 4295 4295 + static const struct pci_device_id sep_pci_id_tbl[] = { 4296 4296 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0826)}, 4297 4297 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x08e9)}, 4298 4298 {0}

+1 -1

drivers/staging/slicoss/slicoss.c

reviewed

··· 136 136 module_param(intagg_delay, int, 0); 137 137 MODULE_PARM_DESC(intagg_delay, "uSec Interrupt Aggregation Delay"); 138 138 139 139 - static DEFINE_PCI_DEVICE_TABLE(slic_pci_tbl) = { 139 139 + static const struct pci_device_id slic_pci_tbl[] = { 140 140 { PCI_DEVICE(PCI_VENDOR_ID_ALACRITECH, SLIC_1GB_DEVICE_ID) }, 141 141 { PCI_DEVICE(PCI_VENDOR_ID_ALACRITECH, SLIC_2GB_DEVICE_ID) }, 142 142 { 0 }

+1 -1

drivers/staging/sm7xxfb/sm7xxfb.c

reviewed

··· 920 920 * 0x712 (LynxEM+) 921 921 * 0x720 (Lynx3DM, Lynx3DM+) 922 922 */ 923 923 - static DEFINE_PCI_DEVICE_TABLE(smtcfb_pci_table) = { 923 923 + static const struct pci_device_id smtcfb_pci_table[] = { 924 924 { PCI_DEVICE(0x126f, 0x710), }, 925 925 { PCI_DEVICE(0x126f, 0x712), }, 926 926 { PCI_DEVICE(0x126f, 0x720), },

+1 -1

drivers/staging/vt6655/device_main.c

reviewed

··· 267 267 {0, NULL} 268 268 }; 269 269 270 270 - DEFINE_PCI_DEVICE_TABLE(vt6655_pci_id_table) = { 270 270 + const struct pci_device_id vt6655_pci_id_table[] = { 271 271 { PCI_VDEVICE(VIA, 0x3253), (kernel_ulong_t)chip_info_table}, 272 272 { 0, } 273 273 };

+1 -1

drivers/staging/xgifb/XGI_main.h

reviewed

··· 11 11 #define PCI_DEVICE_ID_XGI_27 0x027 12 12 #endif 13 13 14 14 - static DEFINE_PCI_DEVICE_TABLE(xgifb_pci_table) = { 14 14 + static const struct pci_device_id xgifb_pci_table[] = { 15 15 {PCI_DEVICE(PCI_VENDOR_ID_XGI, PCI_DEVICE_ID_XGI_20)}, 16 16 {PCI_DEVICE(PCI_VENDOR_ID_XGI, PCI_DEVICE_ID_XGI_27)}, 17 17 {PCI_DEVICE(PCI_VENDOR_ID_XGI, PCI_DEVICE_ID_XGI_40)},

+1 -1

drivers/staging/xillybus/xillybus_pcie.c

reviewed

··· 30 30 31 31 static const char xillyname[] = "xillybus_pcie"; 32 32 33 33 - static DEFINE_PCI_DEVICE_TABLE(xillyids) = { 33 33 + static const struct pci_device_id xillyids[] = { 34 34 {PCI_DEVICE(PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_XILLYBUS)}, 35 35 {PCI_DEVICE(PCI_VENDOR_ID_ALTERA, PCI_DEVICE_ID_XILLYBUS)}, 36 36 {PCI_DEVICE(PCI_VENDOR_ID_ACTEL, PCI_DEVICE_ID_XILLYBUS)},