Commit 94d6b80c authored by Jerry Hoemann's avatar Jerry Hoemann Committed by Wim Van Sebroeck
Browse files

watchdog/hpwdt: Exclude via blacklist 



Instead of having explicit if statments excluding devices,
use a pci_device_id table of devices to blacklist.

Signed-off-by: default avatarJerry Hoemann <jerry.hoemann@hpe.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent e1b83a31

drivers/watchdog/hpwdt.c

+7 −5
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ static const struct pci_device_id hpwdt_devices[] = { 
};

MODULE_DEVICE_TABLE(pci, hpwdt_devices);



static const struct pci_device_id hpwdt_blacklist[] = {

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_HP, 0x3306, PCI_VENDOR_ID_HP, 0x1979) }, /* auxilary iLO */

	{0},			/* terminate list */

};



/*

 *	Watchdog operations
@@ -274,12 +278,10 @@ static int hpwdt_init_one(struct pci_dev *dev, 
		return -ENODEV;

	}



	/*

	 * Ignore all auxilary iLO devices with the following PCI ID

	 */

	if (dev->subsystem_vendor == PCI_VENDOR_ID_HP &&

	    dev->subsystem_device == 0x1979)

	if (pci_match_id(hpwdt_blacklist, dev)) {

		dev_dbg(&dev->dev, "Not supported on this device\n");

		return -ENODEV;

	}



	if (pci_enable_device(dev)) {

		dev_warn(&dev->dev,