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

Most other PCI ID macros use platform acronyms. Follow suit for PNV. Add
INTEL_PNV_IDS() to identify all PNVs.

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/5f9b34a2cd388244be03263a5147776bfe64d5ac.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 59f4aefc6bc1625fe0a8e3cb43f8f62ad5a89eab..f50394a00fca5927dcbc317af197c02ebb445ed2 100644 (file)
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -527,8 +527,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
        INTEL_I945G_IDS(&gen3_early_ops),
        INTEL_I945GM_IDS(&gen3_early_ops),
        INTEL_VLV_IDS(&gen6_early_ops),
-       INTEL_PINEVIEW_G_IDS(&gen3_early_ops),
-       INTEL_PINEVIEW_M_IDS(&gen3_early_ops),
+       INTEL_PNV_IDS(&gen3_early_ops),
        INTEL_I965G_IDS(&gen3_early_ops),
        INTEL_G33_IDS(&gen3_early_ops),
        INTEL_I965GM_IDS(&gen3_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 56a2e17d7d9e22b295c6247ad8989704e08214fd..0e0f5a36507d4f801c93e5546696a70653ba27bb 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -815,8 +815,7 @@ static const struct {
        INTEL_I965GM_IDS(&i965gm_display),
        INTEL_GM45_IDS(&gm45_display),
        INTEL_G45_IDS(&g45_display),
-       INTEL_PINEVIEW_G_IDS(&pnv_display),
-       INTEL_PINEVIEW_M_IDS(&pnv_display),
+       INTEL_PNV_IDS(&pnv_display),
        INTEL_IRONLAKE_D_IDS(&ilk_d_display),
        INTEL_IRONLAKE_M_IDS(&ilk_m_display),
        INTEL_SNB_D_IDS(&snb_display),

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 405ca17a990b4018f3013bc2f3b7fabb4b12a3b9..406e675c532a11fe06497a7d41ab58aae8c3c2ea 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -810,8 +810,8 @@ static const struct pci_device_id pciidlist[] = {
        INTEL_I965GM_IDS(&i965gm_info),
        INTEL_GM45_IDS(&gm45_info),
        INTEL_G45_IDS(&g45_info),
-       INTEL_PINEVIEW_G_IDS(&pnv_g_info),
-       INTEL_PINEVIEW_M_IDS(&pnv_m_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_SNB_D_GT1_IDS(&snb_d_gt1_info),

diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 85ce33ad6e262afbd43ffd4a67b05369a6ac30ad..21942a3c823b50876210a0e70fc3d96e3b17fd80 100644 (file)
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -108,12 +108,16 @@
        INTEL_VGA_DEVICE(0x2e42, info), /* B43_G */ \
        INTEL_VGA_DEVICE(0x2e92, info)  /* B43_G.1 */
 
-#define INTEL_PINEVIEW_G_IDS(info) \
+#define INTEL_PNV_G_IDS(info) \
        INTEL_VGA_DEVICE(0xa001, info)
 
-#define INTEL_PINEVIEW_M_IDS(info) \
+#define INTEL_PNV_M_IDS(info) \
        INTEL_VGA_DEVICE(0xa011, info)
 
+#define INTEL_PNV_IDS(info) \
+       INTEL_PNV_G_IDS(info), \
+       INTEL_PNV_M_IDS(info)
+
 #define INTEL_IRONLAKE_D_IDS(info) \
        INTEL_VGA_DEVICE(0x0042, info)