From 117288dbf305064cd57333bb05442fad0539d0fa Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 5 Mar 2015 10:47:56 -0800 Subject: [PATCH] i915: Remove (mostly) unused IS_PNV, IS_PNVG, and IS_PNVGM macros Inspired by Damien's recent libdrm changes. Signed-off-by: Ian Romanick Reviewed-by: Damien Lespiau Reviewed-by: Jordan Justen --- src/mesa/drivers/dri/i915/intel_chipset.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/i915/intel_chipset.h b/src/mesa/drivers/dri/i915/intel_chipset.h index f7c8b5d..cbcdb14 100644 --- a/src/mesa/drivers/dri/i915/intel_chipset.h +++ b/src/mesa/drivers/dri/i915/intel_chipset.h @@ -49,10 +49,6 @@ #define PCI_CHIP_PNV_GM 0xA011 #define PCI_CHIP_PNV_G 0xA001 -#define IS_PNVGM(devid) (devid == PCI_CHIP_PNV_GM) -#define IS_PNVG(devid) (devid == PCI_CHIP_PNV_G) -#define IS_PNV(devid) (IS_PNVG(devid) || IS_PNVGM(devid)) - #define IS_915(devid) (devid == PCI_CHIP_I915_G || \ devid == PCI_CHIP_E7221_G || \ devid == PCI_CHIP_I915_GM) @@ -62,7 +58,9 @@ devid == PCI_CHIP_I945_GME || \ devid == PCI_CHIP_G33_G || \ devid == PCI_CHIP_Q33_G || \ - devid == PCI_CHIP_Q35_G || IS_PNV(devid)) + devid == PCI_CHIP_Q35_G || \ + devid == PCI_CHIP_PNV_G || \ + devid == PCI_CHIP_PNV_GM) #define IS_GEN3(devid) (IS_915(devid) || \ IS_945(devid)) -- 2.7.4