From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Guenter Roeck <linux@roeck-us.net>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Jiri Slaby <jirislaby@kernel.org>,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-pci@vger.kernel.org
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>,
Bjorn Helgaas <bhelgaas@google.com>
Subject: [PATCH v1 1/1] watchdog: wdt_pci: Correct the PCI ID vendor name
Date: Tue, 5 Oct 2021 18:14:45 +0300 [thread overview]
Message-ID: <20211005151445.89620-1-andriy.shevchenko@linux.intel.com> (raw)
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@linux.intel.com>
---
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
next reply other threads:[~2021-10-05 15:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-05 15:14 Andy Shevchenko [this message]
2021-10-05 15:17 ` [PATCH v1 1/1] watchdog: wdt_pci: Correct the PCI ID vendor name Andy Shevchenko
2021-10-05 15:52 ` Andy Shevchenko
2021-10-05 19:15 ` kernel test robot
2021-10-05 20:47 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211005151445.89620-1-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=jirislaby@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox