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

watchdog: 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>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

authored by

Jingoo Han and committed by
Wim Van Sebroeck
bc17f9dc 627f4b3e

+9 -9
+1 -1
drivers/watchdog/alim1535_wdt.c
··· 301 301 * want to register another driver on the same PCI id. 302 302 */ 303 303 304 - static DEFINE_PCI_DEVICE_TABLE(ali_pci_tbl) __used = { 304 + static const struct pci_device_id ali_pci_tbl[] __used = { 305 305 { PCI_VENDOR_ID_AL, 0x1533, PCI_ANY_ID, PCI_ANY_ID,}, 306 306 { PCI_VENDOR_ID_AL, 0x1535, PCI_ANY_ID, PCI_ANY_ID,}, 307 307 { 0, },
+1 -1
drivers/watchdog/alim7101_wdt.c
··· 414 414 module_init(alim7101_wdt_init); 415 415 module_exit(alim7101_wdt_unload); 416 416 417 - static DEFINE_PCI_DEVICE_TABLE(alim7101_pci_tbl) __used = { 417 + static const struct pci_device_id alim7101_pci_tbl[] __used = { 418 418 { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533) }, 419 419 { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101) }, 420 420 { }
+1 -1
drivers/watchdog/hpwdt.c
··· 55 55 static unsigned long __iomem *hpwdt_timer_reg; 56 56 static unsigned long __iomem *hpwdt_timer_con; 57 57 58 - static DEFINE_PCI_DEVICE_TABLE(hpwdt_devices) = { 58 + static const struct pci_device_id hpwdt_devices[] = { 59 59 { PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xB203) }, /* iLO2 */ 60 60 { PCI_DEVICE(PCI_VENDOR_ID_HP, 0x3306) }, /* iLO3 */ 61 61 {0}, /* terminate list */
+1 -1
drivers/watchdog/i6300esb.c
··· 334 334 /* 335 335 * Data for PCI driver interface 336 336 */ 337 - static DEFINE_PCI_DEVICE_TABLE(esb_pci_tbl) = { 337 + static const struct pci_device_id esb_pci_tbl[] = { 338 338 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_9), }, 339 339 { 0, }, /* End of list */ 340 340 };
+1 -1
drivers/watchdog/nv_tco.c
··· 289 289 * register a pci_driver, because someone else might one day 290 290 * want to register another driver on the same PCI id. 291 291 */ 292 - static DEFINE_PCI_DEVICE_TABLE(tco_pci_tbl) = { 292 + static const struct pci_device_id tco_pci_tbl[] = { 293 293 { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SMBUS, 294 294 PCI_ANY_ID, PCI_ANY_ID, }, 295 295 { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS,
+1 -1
drivers/watchdog/pcwd_pci.c
··· 801 801 cards_found--; 802 802 } 803 803 804 - static DEFINE_PCI_DEVICE_TABLE(pcipcwd_pci_tbl) = { 804 + static const struct pci_device_id pcipcwd_pci_tbl[] = { 805 805 { PCI_VENDOR_ID_QUICKLOGIC, PCI_DEVICE_ID_WATCHDOG_PCIPCWD, 806 806 PCI_ANY_ID, PCI_ANY_ID, }, 807 807 { 0 }, /* End of list */
+1 -1
drivers/watchdog/sp5100_tco.c
··· 303 303 * register a pci_driver, because someone else might 304 304 * want to register another driver on the same PCI id. 305 305 */ 306 - static DEFINE_PCI_DEVICE_TABLE(sp5100_tco_pci_tbl) = { 306 + static const struct pci_device_id sp5100_tco_pci_tbl[] = { 307 307 { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, PCI_ANY_ID, 308 308 PCI_ANY_ID, }, 309 309 { 0, }, /* End of list */
+1 -1
drivers/watchdog/via_wdt.c
··· 239 239 pci_disable_device(pdev); 240 240 } 241 241 242 - static DEFINE_PCI_DEVICE_TABLE(wdt_pci_table) = { 242 + static const struct pci_device_id wdt_pci_table[] = { 243 243 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_CX700) }, 244 244 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX800) }, 245 245 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855) },
+1 -1
drivers/watchdog/wdt_pci.c
··· 720 720 } 721 721 722 722 723 - static DEFINE_PCI_DEVICE_TABLE(wdtpci_pci_tbl) = { 723 + static const struct pci_device_id wdtpci_pci_tbl[] = { 724 724 { 725 725 .vendor = PCI_VENDOR_ID_ACCESSIO, 726 726 .device = PCI_DEVICE_ID_ACCESSIO_WDG_CSM,