[PATCH v1 1/1] watchdog: wdt_pci: Correct the PCI ID vendor name

From: Andy Shevchenko
Date: Tue Oct 05 2021 - 11:14:50 EST


The proper name of Acces I/O is with a single 's'. Correct it respectively.

While at it, convert to use PCI_DEVICE() macro, drop unneeded initializer
and comma.

Fixes: 9f2cc6f759ca ("watchdog: wdt_pci.c: move ids to pci_ids.h")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
---
drivers/watchdog/wdt_pci.c | 9 ++-------
include/linux/pci_ids.h | 4 ++--
2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index d5e56b601351..ba63f442438d 100644
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -717,13 +717,8 @@ static void wdtpci_remove_one(struct pci_dev *pdev)


static const struct pci_device_id wdtpci_pci_tbl[] = {
- {
- .vendor = PCI_VENDOR_ID_ACCESSIO,
- .device = PCI_DEVICE_ID_ACCESSIO_WDG_CSM,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- },
- { 0, }, /* terminate list */
+ { PCI_DEVICE(PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_WDG_CSM) },
+ { } /* terminate list */
};
MODULE_DEVICE_TABLE(pci, wdtpci_pci_tbl);

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 011f2f1ea5bb..37a9f12b4def 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2611,8 +2611,8 @@
#define PCI_VENDOR_ID_AKS 0x416c
#define PCI_DEVICE_ID_AKS_ALADDINCARD 0x0100

-#define PCI_VENDOR_ID_ACCESSIO 0x494f
-#define PCI_DEVICE_ID_ACCESSIO_WDG_CSM 0x22c0
+#define PCI_VENDOR_ID_ACCESIO 0x494f
+#define PCI_DEVICE_ID_ACCESIO_WDG_CSM 0x22c0

#define PCI_VENDOR_ID_S3 0x5333
#define PCI_DEVICE_ID_S3_TRIO 0x8811
--
2.33.0