drm/i915/pciids: remove 11 from INTEL_ICL_IDS()

Most other PCI ID macros do not encode the gen in the name. Follow suit
for ICL.

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/36973674bf333dfdd7cd32ae656754bfa150022b.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 2b698a3f56ef5374b5cf02b61b5dfed25f4c0548..c150bb6f1a399a39087ca42657ad5eeeef0c9cc0 100644 (file)
--- 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 23909a8e2dc8e7a56fc49c977add0ed74f81359f..e47896002c132519829102810fb8f4fb16ec7e63 100644 (file)
--- 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 651b027e370121a6fec456e6426e9cb669ee06dc..9e6d9072de359fa401330cb20c436aa6826aead8 100644 (file)
--- 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 0c5a20d598017c8ef56347e10e60d49558a95834..ecfd7f71e2e744cbdb011031b340fa7b81fbee5a 100644 (file)
--- 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)