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

Commit 92dd9994 authored by Jiri Slaby's avatar Jiri Slaby Committed by Wim Van Sebroeck
Browse files

[WATCHDOG] i8xx_tco remove pci_find_device. 



Use refcounting for pci device obtaining.
Use PCI_DEVICE macro.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
Cc: Andrew Morton <akpm@osdl.org>
parent 02be2ee9

drivers/char/watchdog/i8xx_tco.c

+19 −14
Original line number Diff line number Diff line
@@ -406,18 +406,18 @@ static struct notifier_block i8xx_tco_notifier = { 
 * want to register another driver on the same PCI id.

 */

static struct pci_device_id i8xx_tco_pci_tbl[] = {

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_0,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_0,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_10,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801E_0,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1,	PCI_ANY_ID, PCI_ANY_ID, },

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

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_0) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_0) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_10) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801E_0) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1) },

	{ },			/* End of list */

};

MODULE_DEVICE_TABLE (pci, i8xx_tco_pci_tbl);
@@ -434,12 +434,11 @@ static unsigned char __init i8xx_tco_getdevice (void) 
	 *      Find the PCI device

	 */



	while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {

	for_each_pci_dev(dev)

		if (pci_match_id(i8xx_tco_pci_tbl, dev)) {

			i8xx_tco_pci = dev;

			break;

		}

	}



	if (i8xx_tco_pci) {

		/*
@@ -454,6 +453,7 @@ static unsigned char __init i8xx_tco_getdevice (void) 
		/* Something's wrong here, ACPIBASE has to be set */

		if (badr == 0x0001 || badr == 0x0000) {

			printk (KERN_ERR PFX "failed to get TCOBASE address\n");

			pci_dev_put(i8xx_tco_pci);

			return 0;

		}
@@ -465,6 +465,7 @@ static unsigned char __init i8xx_tco_getdevice (void) 
			pci_read_config_byte (i8xx_tco_pci, 0xd4, &val1);

			if (val1 & 0x02) {

				printk (KERN_ERR PFX "failed to reset NO_REBOOT flag, reboot disabled by hardware\n");

				pci_dev_put(i8xx_tco_pci);

				return 0;	/* Cannot reset NO_REBOOT bit */

			}

		}
@@ -476,6 +477,7 @@ static unsigned char __init i8xx_tco_getdevice (void) 
		if (!request_region (SMI_EN + 1, 1, "i8xx TCO")) {

			printk (KERN_ERR PFX "I/O address 0x%04x already in use\n",

				SMI_EN + 1);

			pci_dev_put(i8xx_tco_pci);

			return 0;

		}

		val1 = inb (SMI_EN + 1);
@@ -542,6 +544,7 @@ static int __init watchdog_init (void) 
unreg_region:

	release_region (TCOBASE, 0x10);

out:

	pci_dev_put(i8xx_tco_pci);

	return ret;

}
@@ -555,6 +558,8 @@ static void __exit watchdog_cleanup (void) 
	misc_deregister (&i8xx_tco_miscdev);

	unregister_reboot_notifier(&i8xx_tco_notifier);

	release_region (TCOBASE, 0x10);



	pci_dev_put(i8xx_tco_pci);

}



module_init(watchdog_init);