forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
627f4b3ee3
commit
bc17f9dcb1
|
@ -301,7 +301,7 @@ static int ali_notify_sys(struct notifier_block *this,
|
|||
* want to register another driver on the same PCI id.
|
||||
*/
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(ali_pci_tbl) __used = {
|
||||
static const struct pci_device_id ali_pci_tbl[] __used = {
|
||||
{ PCI_VENDOR_ID_AL, 0x1533, PCI_ANY_ID, PCI_ANY_ID,},
|
||||
{ PCI_VENDOR_ID_AL, 0x1535, PCI_ANY_ID, PCI_ANY_ID,},
|
||||
{ 0, },
|
||||
|
|
|
@ -414,7 +414,7 @@ static int __init alim7101_wdt_init(void)
|
|||
module_init(alim7101_wdt_init);
|
||||
module_exit(alim7101_wdt_unload);
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(alim7101_pci_tbl) __used = {
|
||||
static const struct pci_device_id alim7101_pci_tbl[] __used = {
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101) },
|
||||
{ }
|
||||
|
|
|
@ -55,7 +55,7 @@ static void __iomem *pci_mem_addr; /* the PCI-memory address */
|
|||
static unsigned long __iomem *hpwdt_timer_reg;
|
||||
static unsigned long __iomem *hpwdt_timer_con;
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(hpwdt_devices) = {
|
||||
static const struct pci_device_id hpwdt_devices[] = {
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xB203) }, /* iLO2 */
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_HP, 0x3306) }, /* iLO3 */
|
||||
{0}, /* terminate list */
|
||||
|
|
|
@ -334,7 +334,7 @@ static struct miscdevice esb_miscdev = {
|
|||
/*
|
||||
* Data for PCI driver interface
|
||||
*/
|
||||
static DEFINE_PCI_DEVICE_TABLE(esb_pci_tbl) = {
|
||||
static const struct pci_device_id esb_pci_tbl[] = {
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_9), },
|
||||
{ 0, }, /* End of list */
|
||||
};
|
||||
|
|
|
@ -289,7 +289,7 @@ static struct miscdevice nv_tco_miscdev = {
|
|||
* register a pci_driver, because someone else might one day
|
||||
* want to register another driver on the same PCI id.
|
||||
*/
|
||||
static DEFINE_PCI_DEVICE_TABLE(tco_pci_tbl) = {
|
||||
static const struct pci_device_id tco_pci_tbl[] = {
|
||||
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SMBUS,
|
||||
PCI_ANY_ID, PCI_ANY_ID, },
|
||||
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS,
|
||||
|
|
|
@ -801,7 +801,7 @@ static void pcipcwd_card_exit(struct pci_dev *pdev)
|
|||
cards_found--;
|
||||
}
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(pcipcwd_pci_tbl) = {
|
||||
static const struct pci_device_id pcipcwd_pci_tbl[] = {
|
||||
{ PCI_VENDOR_ID_QUICKLOGIC, PCI_DEVICE_ID_WATCHDOG_PCIPCWD,
|
||||
PCI_ANY_ID, PCI_ANY_ID, },
|
||||
{ 0 }, /* End of list */
|
||||
|
|
|
@ -303,7 +303,7 @@ static struct miscdevice sp5100_tco_miscdev = {
|
|||
* register a pci_driver, because someone else might
|
||||
* want to register another driver on the same PCI id.
|
||||
*/
|
||||
static DEFINE_PCI_DEVICE_TABLE(sp5100_tco_pci_tbl) = {
|
||||
static const struct pci_device_id sp5100_tco_pci_tbl[] = {
|
||||
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, PCI_ANY_ID,
|
||||
PCI_ANY_ID, },
|
||||
{ 0, }, /* End of list */
|
||||
|
|
|
@ -239,7 +239,7 @@ static void wdt_remove(struct pci_dev *pdev)
|
|||
pci_disable_device(pdev);
|
||||
}
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(wdt_pci_table) = {
|
||||
static const struct pci_device_id wdt_pci_table[] = {
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_CX700) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX800) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855) },
|
||||
|
|
|
@ -720,7 +720,7 @@ static void wdtpci_remove_one(struct pci_dev *pdev)
|
|||
}
|
||||
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(wdtpci_pci_tbl) = {
|
||||
static const struct pci_device_id wdtpci_pci_tbl[] = {
|
||||
{
|
||||
.vendor = PCI_VENDOR_ID_ACCESSIO,
|
||||
.device = PCI_DEVICE_ID_ACCESSIO_WDG_CSM,
|
||||
|
|
Loading…
Reference in New Issue
Block a user