Skip to content
Snippets Groups Projects
Commit e6015e3d authored by Jiaqing Zhao's avatar Jiaqing Zhao Committed by Greg Kroah-Hartman
Browse files

can: ems_pci: remove PCI_SUBVENDOR_ID_ASIX definition


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: default avatarJiaqing Zhao <jiaqing.zhao@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Link: https://lore.kernel.org/r/20230724083933.3173513-2-jiaqing.zhao@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cd119fdc
No related branches found
No related tags found
No related merge requests found
...@@ -111,7 +111,6 @@ struct ems_pci_card { ...@@ -111,7 +111,6 @@ struct ems_pci_card {
#ifndef PCI_VENDOR_ID_ASIX #ifndef PCI_VENDOR_ID_ASIX
#define PCI_VENDOR_ID_ASIX 0x125b #define PCI_VENDOR_ID_ASIX 0x125b
#define PCI_DEVICE_ID_ASIX_9110 0x9110 #define PCI_DEVICE_ID_ASIX_9110 0x9110
#define PCI_SUBVENDOR_ID_ASIX 0xa000
#endif #endif
#define PCI_SUBDEVICE_ID_EMS 0x4010 #define PCI_SUBDEVICE_ID_EMS 0x4010
...@@ -123,7 +122,7 @@ static const struct pci_device_id ems_pci_tbl[] = { ...@@ -123,7 +122,7 @@ static const struct pci_device_id ems_pci_tbl[] = {
/* CPC-104P v2 */ /* CPC-104P v2 */
{PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_PLX, 0x4002}, {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_PLX, 0x4002},
/* CPC-PCIe v3 */ /* 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,} {0,}
}; };
MODULE_DEVICE_TABLE(pci, ems_pci_tbl); MODULE_DEVICE_TABLE(pci, ems_pci_tbl);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment