On Fri, Jun 13, 2025 at 03:48:04PM +0200, Herve Codina wrote:
> Existing code uses the 0x9660 value (LAN9662 PCI Device ID) in several
> places.
>
> Avoid this direct use of the 0x9660 value replacing it by defined PCI
> Device ID.
>
> Signed-off-by: Herve Codina <herve.codina@xxxxxxxxxxx>
Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> ---
> drivers/misc/lan966x_pci.c | 2 +-
> drivers/pci/quirks.c | 2 +-
> include/linux/pci_ids.h | 1 +
> 3 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/misc/lan966x_pci.c b/drivers/misc/lan966x_pci.c
> index b28066c96534..e60ab662b8f3 100644
> --- a/drivers/misc/lan966x_pci.c
> +++ b/drivers/misc/lan966x_pci.c
> @@ -197,7 +197,7 @@ static void lan966x_pci_remove(struct pci_dev *pdev)
> }
>
> static struct pci_device_id lan966x_pci_ids[] = {
> - { PCI_DEVICE(PCI_VENDOR_ID_EFAR, 0x9660) },
> + { PCI_DEVICE(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_LAN9662) },
> { }
> };
> MODULE_DEVICE_TABLE(pci, lan966x_pci_ids);
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index d7f4ee634263..bde077ce663a 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -6302,7 +6302,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0xa76e, dpc_log_size);
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_XILINX, 0x5020, of_pci_make_dev_node);
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_XILINX, 0x5021, of_pci_make_dev_node);
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_REDHAT, 0x0005, of_pci_make_dev_node);
> -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_EFAR, 0x9660, of_pci_make_dev_node);
> +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_LAN9662, of_pci_make_dev_node);
>
> /*
> * Devices known to require a longer delay before first config space access
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index e2d71b6fdd84..5d69fde7dd97 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -934,6 +934,7 @@
> #define PCI_VENDOR_ID_EFAR 0x1055
> #define PCI_DEVICE_ID_EFAR_SLC90E66_1 0x9130
> #define PCI_DEVICE_ID_EFAR_SLC90E66_3 0x9463
> +#define PCI_DEVICE_ID_EFAR_LAN9662 0x9660
>
> #define PCI_VENDOR_ID_MOTOROLA 0x1057
> #define PCI_DEVICE_ID_MOTOROLA_MPC105 0x0001
> --
> 2.49.0
>
