i915: Remove (mostly) unused IS_915 macro

Inspired by Damien's recent libdrm changes.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/src/mesa/drivers/dri/i915/intel_chipset.h b/src/mesa/drivers/dri/i915/intel_chipset.h
index cbcdb140438f3021f4264d2943cf1cd0a27dba14..d33a80f76376d3876874f338988c7bef6a0ed7fb 100644 (file)
--- 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_915(devid)          (devid == PCI_CHIP_I915_G || \
-                                devid == PCI_CHIP_E7221_G || \
-                                devid == PCI_CHIP_I915_GM)
-
 #define IS_945(devid)          (devid == PCI_CHIP_I945_G || \
                                 devid == PCI_CHIP_I945_GM || \
                                 devid == PCI_CHIP_I945_GME || \
@@ -62,7 +58,9 @@
                                 devid == PCI_CHIP_PNV_G || \
                                 devid == PCI_CHIP_PNV_GM)
 
-#define IS_GEN3(devid)         (IS_915(devid) ||       \
+#define IS_GEN3(devid)         (devid == PCI_CHIP_I915_G || \
+                                devid == PCI_CHIP_E7221_G || \
+                                devid == PCI_CHIP_I915_GM || \
                                 IS_945(devid))
 
 #define IS_GEN2(devid)         (devid == PCI_CHIP_I830_M || \