On Wed, Dec 05, 2018 at 05:42:21PM -0700, Jerry Hoemann wrote:
> Instead of having explicit if statments excluding devices,
> use a pci_device_id table of devices to blacklist.
>
> Signed-off-by: Jerry Hoemann <jerry.hoemann@xxxxxxx>
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/watchdog/hpwdt.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
> index 9356230..eecd014 100644
> --- a/drivers/watchdog/hpwdt.c
> +++ b/drivers/watchdog/hpwdt.c
> @@ -50,6 +50,10 @@
> };
> 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,
> --
> 1.8.3.1
>
