On Tue, Jul 18, 2023 at 05:41:58PM +0000, Jiaqing Zhao wrote:
> Move PCI Vendor and Device ID of ASIX AX99100 PCIe to Multi I/O
> Controller to pci_ids.h for its serial and parallel port driver
> support in subsequent patches.
>
> Signed-off-by: Jiaqing Zhao <jiaqing.zhao@xxxxxxxxxxxxxxx>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> ---
> drivers/net/can/sja1000/ems_pci.c | 6 +-----
> include/linux/pci_ids.h | 4 ++++
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c
> index 3e18c63a982c..1aaedaf866f1 100644
> --- a/drivers/net/can/sja1000/ems_pci.c
> +++ b/drivers/net/can/sja1000/ems_pci.c
> @@ -108,10 +108,6 @@ struct ems_pci_card {
>
> #define EMS_PCI_BASE_SIZE 4096 /* size of controller area */
>
> -#ifndef PCI_VENDOR_ID_ASIX
> -#define PCI_VENDOR_ID_ASIX 0x125b
> -#define PCI_DEVICE_ID_ASIX_9110 0x9110
> -#endif
> #define PCI_SUBDEVICE_ID_EMS 0x4010
>
> static const struct pci_device_id ems_pci_tbl[] = {
> @@ -122,7 +118,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, 0xa000, PCI_SUBDEVICE_ID_EMS},
> + {PCI_VENDOR_ID_ASIX, PCI_DEVICE_ID_ASIX_AX99100_LB, 0xa000, PCI_SUBDEVICE_ID_EMS},
> {0,}
> };
> MODULE_DEVICE_TABLE(pci, ems_pci_tbl);
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 2dc75df1437f..16608ce4fd0f 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -1760,6 +1760,10 @@
> #define PCI_SUBDEVICE_ID_AT_2700FX 0x2701
> #define PCI_SUBDEVICE_ID_AT_2701FX 0x2703
>
> +#define PCI_VENDOR_ID_ASIX 0x125b
> +#define PCI_DEVICE_ID_ASIX_AX99100 0x9100
> +#define PCI_DEVICE_ID_ASIX_AX99100_LB 0x9110
> +
> #define PCI_VENDOR_ID_ESS 0x125d
> #define PCI_DEVICE_ID_ESS_ESS1968 0x1968
> #define PCI_DEVICE_ID_ESS_ESS1978 0x1978
> --
> 2.39.2
>
