[PATCH 6/8] drm/i915/pciids: remove 11 from INTEL_ICL_IDS()

[Rodrigo Vivi]

On Fri, May 10, 2024 at 02:22:19PM +0300, Jani Nikula wrote:
> Most other PCI ID macros do not encode the gen in the name. Follow suit
> for ICL.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> 
> Cc: Bjorn Helgaas <bhelgaas at google.com>
> Cc: linux-pci at vger.kernel.org
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  arch/x86/kernel/early-quirks.c                      | 2 +-
>  drivers/gpu/drm/i915/display/intel_display_device.c | 2 +-
>  drivers/gpu/drm/i915/i915_pci.c                     | 2 +-
>  include/drm/i915_pciids.h                           | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> index 2b698a3f56ef..c150bb6f1a39 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -547,7 +547,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
>  	INTEL_CML_IDS(&gen9_early_ops),
>  	INTEL_GLK_IDS(&gen9_early_ops),
>  	INTEL_CNL_IDS(&gen9_early_ops),
> -	INTEL_ICL_11_IDS(&gen11_early_ops),
> +	INTEL_ICL_IDS(&gen11_early_ops),
>  	INTEL_EHL_IDS(&gen11_early_ops),
>  	INTEL_JSL_IDS(&gen11_early_ops),
>  	INTEL_TGL_12_IDS(&gen11_early_ops),
> diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
> index 23909a8e2dc8..e47896002c13 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.c
> @@ -831,7 +831,7 @@ static const struct {
>  	INTEL_CFL_IDS(&skl_display),
>  	INTEL_WHL_IDS(&skl_display),
>  	INTEL_CML_IDS(&skl_display),
> -	INTEL_ICL_11_IDS(&icl_display),
> +	INTEL_ICL_IDS(&icl_display),
>  	INTEL_EHL_IDS(&jsl_ehl_display),
>  	INTEL_JSL_IDS(&jsl_ehl_display),
>  	INTEL_TGL_12_IDS(&tgl_display),
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index d85f023afebe..06b1d50ae47c 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -857,7 +857,7 @@ static const struct pci_device_id pciidlist[] = {
>  	INTEL_CML_GT2_IDS(&cml_gt2_info),
>  	INTEL_CML_U_GT1_IDS(&cml_gt1_info),
>  	INTEL_CML_U_GT2_IDS(&cml_gt2_info),
> -	INTEL_ICL_11_IDS(&icl_info),
> +	INTEL_ICL_IDS(&icl_info),
>  	INTEL_EHL_IDS(&ehl_info),
>  	INTEL_JSL_IDS(&jsl_info),
>  	INTEL_TGL_12_IDS(&tgl_info),
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index 0c5a20d59801..ecfd7f71e2e7 100644
> --- a/include/drm/i915_pciids.h
> +++ b/include/drm/i915_pciids.h
> @@ -597,7 +597,7 @@
>  	INTEL_VGA_DEVICE(0x8A70, info), \
>  	INTEL_VGA_DEVICE(0x8A71, info)
>  
> -#define INTEL_ICL_11_IDS(info) \
> +#define INTEL_ICL_IDS(info) \
>  	INTEL_ICL_PORT_F_IDS(info), \
>  	INTEL_VGA_DEVICE(0x8A51, info), \
>  	INTEL_VGA_DEVICE(0x8A5D, info)
> -- 
> 2.39.2
>