drm/i915/pciids: add INTEL_ILK_IDS(), use acronym

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
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://patchwork.freedesktop.org/patch/msgid/27ada56363cfa6a5b093cb31908a4b89aa912621.1715340032.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index f50394a00fca5927dcbc317af197c02ebb445ed2..d8419d310091224b9a00cb42d6ccfb4aee8474f0 100644 (file)
--- 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 0e0f5a36507d4f801c93e5546696a70653ba27bb..052fd1c290c3f69a90adaa03512d1b2acfb88d57 100644 (file)
--- 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 406e675c532a11fe06497a7d41ab58aae8c3c2ea..651b027e370121a6fec456e6426e9cb669ee06dc 100644 (file)
--- 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 21942a3c823b50876210a0e70fc3d96e3b17fd80..05f466ca8ce2b79452fa34c788970bb21d526a88 100644 (file)
--- 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)