diff mbox series

[2/8] drm/i915/pciids: add INTEL_ILK_IDS(), use acronym

Message ID 27ada56363cfa6a5b093cb31908a4b89aa912621.1715340032.git.jani.nikula@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915/pciids: PCI ID macro cleanups | expand

Commit Message

Jani Nikula May 10, 2024, 11:22 a.m. UTC 
Most other PCI ID macros use platform acronyms. Follow suit for ILK. Add
INTEL_ILK_IDS() to identify all ILKs.

Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 arch/x86/kernel/early-quirks.c                      | 3 +--
 drivers/gpu/drm/i915/display/intel_display_device.c | 4 ++--
 drivers/gpu/drm/i915/i915_pci.c                     | 4 ++--
 include/drm/i915_pciids.h                           | 8 ++++++--
 4 files changed, 11 insertions(+), 8 deletions(-)

Comments

Rodrigo Vivi May 10, 2024, 1:31 p.m. UTC | #1 
On Fri, May 10, 2024 at 02:22:15PM +0300, Jani Nikula wrote:
> Most other PCI ID macros use platform acronyms. Follow suit for ILK. Add
> INTEL_ILK_IDS() to identify all ILKs.

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

> 
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: linux-pci@vger.kernel.org
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  arch/x86/kernel/early-quirks.c                      | 3 +--
>  drivers/gpu/drm/i915/display/intel_display_device.c | 4 ++--
>  drivers/gpu/drm/i915/i915_pci.c                     | 4 ++--
>  include/drm/i915_pciids.h                           | 8 ++++++--
>  4 files changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> index f50394a00fca..d8419d310091 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -533,8 +533,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
>  	INTEL_I965GM_IDS(&gen3_early_ops),
>  	INTEL_GM45_IDS(&gen3_early_ops),
>  	INTEL_G45_IDS(&gen3_early_ops),
> -	INTEL_IRONLAKE_D_IDS(&gen3_early_ops),
> -	INTEL_IRONLAKE_M_IDS(&gen3_early_ops),
> +	INTEL_ILK_IDS(&gen3_early_ops),
>  	INTEL_SNB_D_IDS(&gen6_early_ops),
>  	INTEL_SNB_M_IDS(&gen6_early_ops),
>  	INTEL_IVB_M_IDS(&gen6_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 0e0f5a36507d..052fd1c290c3 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.c
> @@ -816,8 +816,8 @@ static const struct {
>  	INTEL_GM45_IDS(&gm45_display),
>  	INTEL_G45_IDS(&g45_display),
>  	INTEL_PNV_IDS(&pnv_display),
> -	INTEL_IRONLAKE_D_IDS(&ilk_d_display),
> -	INTEL_IRONLAKE_M_IDS(&ilk_m_display),
> +	INTEL_ILK_D_IDS(&ilk_d_display),
> +	INTEL_ILK_M_IDS(&ilk_m_display),
>  	INTEL_SNB_D_IDS(&snb_display),
>  	INTEL_SNB_M_IDS(&snb_display),
>  	INTEL_IVB_M_IDS(&ivb_display),
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index aa8593d73198..d85f023afebe 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -812,8 +812,8 @@ static const struct pci_device_id pciidlist[] = {
>  	INTEL_G45_IDS(&g45_info),
>  	INTEL_PNV_G_IDS(&pnv_g_info),
>  	INTEL_PNV_M_IDS(&pnv_m_info),
> -	INTEL_IRONLAKE_D_IDS(&ilk_d_info),
> -	INTEL_IRONLAKE_M_IDS(&ilk_m_info),
> +	INTEL_ILK_D_IDS(&ilk_d_info),
> +	INTEL_ILK_M_IDS(&ilk_m_info),
>  	INTEL_SNB_D_GT1_IDS(&snb_d_gt1_info),
>  	INTEL_SNB_D_GT2_IDS(&snb_d_gt2_info),
>  	INTEL_SNB_M_GT1_IDS(&snb_m_gt1_info),
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index 21942a3c823b..05f466ca8ce2 100644
> --- a/include/drm/i915_pciids.h
> +++ b/include/drm/i915_pciids.h
> @@ -118,12 +118,16 @@
>  	INTEL_PNV_G_IDS(info), \
>  	INTEL_PNV_M_IDS(info)
>  
> -#define INTEL_IRONLAKE_D_IDS(info) \
> +#define INTEL_ILK_D_IDS(info) \
>  	INTEL_VGA_DEVICE(0x0042, info)
>  
> -#define INTEL_IRONLAKE_M_IDS(info) \
> +#define INTEL_ILK_M_IDS(info) \
>  	INTEL_VGA_DEVICE(0x0046, info)
>  
> +#define INTEL_ILK_IDS(info) \
> +	INTEL_ILK_D_IDS(info), \
> +	INTEL_ILK_M_IDS(info)
> +
>  #define INTEL_SNB_D_GT1_IDS(info) \
>  	INTEL_VGA_DEVICE(0x0102, info), \
>  	INTEL_VGA_DEVICE(0x010A, info)
> -- 
> 2.39.2
>
diff mbox series

Patch

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index f50394a00fca..d8419d310091 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -533,8 +533,7 @@  static const struct pci_device_id intel_early_ids[] __initconst = {
 	INTEL_I965GM_IDS(&gen3_early_ops),
 	INTEL_GM45_IDS(&gen3_early_ops),
 	INTEL_G45_IDS(&gen3_early_ops),
-	INTEL_IRONLAKE_D_IDS(&gen3_early_ops),
-	INTEL_IRONLAKE_M_IDS(&gen3_early_ops),
+	INTEL_ILK_IDS(&gen3_early_ops),
 	INTEL_SNB_D_IDS(&gen6_early_ops),
 	INTEL_SNB_M_IDS(&gen6_early_ops),
 	INTEL_IVB_M_IDS(&gen6_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 0e0f5a36507d..052fd1c290c3 100644
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -816,8 +816,8 @@  static const struct {
 	INTEL_GM45_IDS(&gm45_display),
 	INTEL_G45_IDS(&g45_display),
 	INTEL_PNV_IDS(&pnv_display),
-	INTEL_IRONLAKE_D_IDS(&ilk_d_display),
-	INTEL_IRONLAKE_M_IDS(&ilk_m_display),
+	INTEL_ILK_D_IDS(&ilk_d_display),
+	INTEL_ILK_M_IDS(&ilk_m_display),
 	INTEL_SNB_D_IDS(&snb_display),
 	INTEL_SNB_M_IDS(&snb_display),
 	INTEL_IVB_M_IDS(&ivb_display),
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index aa8593d73198..d85f023afebe 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -812,8 +812,8 @@  static const struct pci_device_id pciidlist[] = {
 	INTEL_G45_IDS(&g45_info),
 	INTEL_PNV_G_IDS(&pnv_g_info),
 	INTEL_PNV_M_IDS(&pnv_m_info),
-	INTEL_IRONLAKE_D_IDS(&ilk_d_info),
-	INTEL_IRONLAKE_M_IDS(&ilk_m_info),
+	INTEL_ILK_D_IDS(&ilk_d_info),
+	INTEL_ILK_M_IDS(&ilk_m_info),
 	INTEL_SNB_D_GT1_IDS(&snb_d_gt1_info),
 	INTEL_SNB_D_GT2_IDS(&snb_d_gt2_info),
 	INTEL_SNB_M_GT1_IDS(&snb_m_gt1_info),
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 21942a3c823b..05f466ca8ce2 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -118,12 +118,16 @@ 
 	INTEL_PNV_G_IDS(info), \
 	INTEL_PNV_M_IDS(info)
 
-#define INTEL_IRONLAKE_D_IDS(info) \
+#define INTEL_ILK_D_IDS(info) \
 	INTEL_VGA_DEVICE(0x0042, info)
 
-#define INTEL_IRONLAKE_M_IDS(info) \
+#define INTEL_ILK_M_IDS(info) \
 	INTEL_VGA_DEVICE(0x0046, info)
 
+#define INTEL_ILK_IDS(info) \
+	INTEL_ILK_D_IDS(info), \
+	INTEL_ILK_M_IDS(info)
+
 #define INTEL_SNB_D_GT1_IDS(info) \
 	INTEL_VGA_DEVICE(0x0102, info), \
 	INTEL_VGA_DEVICE(0x010A, info)