From: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
To: Wolfgang Grandegger <wg@grandegger.com>,
Marc Kleine-Budde <mkl@pengutronix.de>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-serial@vger.kernel.org, linux-pci@vger.kernel.org,
linux-can@vger.kernel.org, linux-kernel@vger.kernel.org,
Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
Subject: [PATCH 1/4] can: ems_pci: remove PCI_SUBVENDOR_ID_ASIX definition
Date: Tue, 18 Jul 2023 17:41:57 +0000 [thread overview]
Message-ID: <20230718174200.2862849-2-jiaqing.zhao@linux.intel.com> (raw)
In-Reply-To: <20230718174200.2862849-1-jiaqing.zhao@linux.intel.com>
PCI_SUBVENDOR_ID_ASIX is defined as 0xa000, which is not the vendor id
assigned to ASIX by PCI-SIG. Remove it to avoid possible confusion and
conflict.
Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/net/can/sja1000/ems_pci.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c
index c56e27223e5f..3e18c63a982c 100644
--- a/drivers/net/can/sja1000/ems_pci.c
+++ b/drivers/net/can/sja1000/ems_pci.c
@@ -111,7 +111,6 @@ struct ems_pci_card {
#ifndef PCI_VENDOR_ID_ASIX
#define PCI_VENDOR_ID_ASIX 0x125b
#define PCI_DEVICE_ID_ASIX_9110 0x9110
-#define PCI_SUBVENDOR_ID_ASIX 0xa000
#endif
#define PCI_SUBDEVICE_ID_EMS 0x4010
@@ -123,7 +122,7 @@ static const struct pci_device_id ems_pci_tbl[] = {
/* CPC-104P v2 */
{PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_PLX, 0x4002},
/* CPC-PCIe v3 */
- {PCI_VENDOR_ID_ASIX, PCI_DEVICE_ID_ASIX_9110, PCI_SUBVENDOR_ID_ASIX, PCI_SUBDEVICE_ID_EMS},
+ {PCI_VENDOR_ID_ASIX, PCI_DEVICE_ID_ASIX_9110, 0xa000, PCI_SUBDEVICE_ID_EMS},
{0,}
};
MODULE_DEVICE_TABLE(pci, ems_pci_tbl);
--
2.39.2
next prev parent reply other threads:[~2023-07-18 17:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-18 17:41 [PATCH 0/4] add support for ASIX AX99100 Jiaqing Zhao
2023-07-18 17:41 ` Jiaqing Zhao [this message]
2023-07-18 17:41 ` [PATCH 2/4] can: ems_pci: move ASIX AX99100 ids to pci_ids.h Jiaqing Zhao
2023-07-18 18:48 ` Bjorn Helgaas
2023-07-18 17:41 ` [PATCH 3/4] serial: 8250_pci: add support for ASIX AX99100 Jiaqing Zhao
2023-07-18 18:50 ` Bjorn Helgaas
2023-07-18 17:42 ` [PATCH 4/4] parport_pc: " Jiaqing Zhao
2023-07-20 9:26 ` [PATCH 0/4] " Marc Kleine-Budde
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=20230718174200.2862849-2-jiaqing.zhao@linux.intel.com \
--to=jiaqing.zhao@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=sudipm.mukherjee@gmail.com \
--cc=wg@grandegger.com \
/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;
as well as URLs for NNTP newsgroup(s).