[PATCH 3/8] [drm/i915]: kill superflous IS_I855 macro

[Daniel Vetter]

It is identical to I85X. Use that one instead.

Signed-off-by: Daniel Vetter <daniel.vet...@ffwll.ch>
---
 drivers/gpu/drm/i915/i915_drv.h      |    1 -
 drivers/gpu/drm/i915/intel_display.c |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 0327ecf..7e5683e 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -858,7 +858,6 @@ extern int i915_wait_ring(struct drm_device * dev, int n, 
const char *caller);
 #define IS_I830(dev) ((dev)->pci_device == 0x3577)
 #define IS_845G(dev) ((dev)->pci_device == 0x2562)
 #define IS_I85X(dev) ((dev)->pci_device == 0x3582)
-#define IS_I855(dev) ((dev)->pci_device == 0x3582)
 #define IS_I865G(dev) ((dev)->pci_device == 0x2572)
 
 #define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device == 
0x258a)
diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index cadb9ef..7294a8f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1922,7 +1922,7 @@ static int intel_get_core_clock_speed(struct drm_device 
*dev)
                }
        } else if (IS_I865G(dev))
                return 266000;
-       else if (IS_I855(dev)) {
+       else if (IS_I85X(dev)) {
                u16 hpllcc = 0;
                /* Assume that the hardware is in the high speed state.  This
                 * should be the default.
@@ -4019,7 +4019,7 @@ void intel_init_clock_gating(struct drm_device *dev)
                dstate |= DSTATE_PLL_D3_OFF | DSTATE_GFX_CLOCK_GATING |
                        DSTATE_DOT_CLOCK_GATING;
                I915_WRITE(D_STATE, dstate);
-       } else if (IS_I855(dev) || IS_I865G(dev)) {
+       } else if (IS_I85X(dev) || IS_I865G(dev)) {
                I915_WRITE(RENCLK_GATE_D1, SV_CLOCK_GATE_DISABLE);
        } else if (IS_I830(dev)) {
                I915_WRITE(DSPCLK_GATE_D, OVRUNIT_CLOCK_GATE_DISABLE);
-- 
1.6.3.3


------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel