Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4562f539 authored by Wim Van Sebroeck's avatar Wim Van Sebroeck
Browse files

watchdog: convert to DEFINE_PCI_DEVICE_TABLE 



Convert static struct pci_device_id *[] to static DEFINE_PCI_DEVICE_TABLE tables.

Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 066d6c7f

drivers/watchdog/alim1535_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ static int ali_notify_sys(struct notifier_block *this, 
 *	want to register another driver on the same PCI id.

 */



static struct pci_device_id ali_pci_tbl[] __used = {

static DEFINE_PCI_DEVICE_TABLE(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, },

drivers/watchdog/alim7101_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static int __init alim7101_wdt_init(void) 
module_init(alim7101_wdt_init);

module_exit(alim7101_wdt_unload);



static struct pci_device_id alim7101_pci_tbl[] __devinitdata __used = {

static DEFINE_PCI_DEVICE_TABLE(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) },

	{ }

drivers/watchdog/hpwdt.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,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 struct pci_device_id hpwdt_devices[] = {

static DEFINE_PCI_DEVICE_TABLE(hpwdt_devices) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xB203) },	/* iLO2 */

	{ PCI_DEVICE(PCI_VENDOR_ID_HP, 0x3306) },	/* iLO3 */

	{0},			/* terminate list */

drivers/watchdog/i6300esb.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static struct miscdevice esb_miscdev = { 
/*

 * Data for PCI driver interface

 */

static struct pci_device_id esb_pci_tbl[] = {

static DEFINE_PCI_DEVICE_TABLE(esb_pci_tbl) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_9), },

	{ 0, },                 /* End of list */

};

drivers/watchdog/iTCO_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static struct { 
 * pci_driver, because the I/O Controller Hub has also other

 * functions that probably will be registered by other drivers.

 */

static struct pci_device_id iTCO_wdt_pci_tbl[] = {

static DEFINE_PCI_DEVICE_TABLE(iTCO_wdt_pci_tbl) = {

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_82801AA_0,	TCO_ICH)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_82801AB_0,	TCO_ICH0)},

	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_82801BA_0,	TCO_ICH2)},