lkml.org 
[lkml]   [2009]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] [drm] Remove duplicated code
Date
In apparent haste to generalize, the old version got left behind.  This patch
removes the old version and cleans up the generalization in the new one.

Signed-off-by: Jonas Bonn <jonas@southpole.se>
---
drivers/gpu/drm/i915/intel_display.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 64773ce..3148cda 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1836,12 +1836,6 @@ static void intel_setup_outputs(struct drm_device *dev)
int found;
u32 reg;

- if (I915_READ(SDVOB) & SDVO_DETECTED) {
- found = intel_sdvo_init(dev, SDVOB);
- if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
- intel_hdmi_init(dev, SDVOB);
- }
-
/* Before G4X SDVOC doesn't have its own detect register */
if (IS_G4X(dev))
reg = SDVOC;
@@ -1849,9 +1843,9 @@ static void intel_setup_outputs(struct drm_device *dev)
reg = SDVOB;

if (I915_READ(reg) & SDVO_DETECTED) {
- found = intel_sdvo_init(dev, SDVOC);
+ found = intel_sdvo_init(dev, reg);
if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
- intel_hdmi_init(dev, SDVOC);
+ intel_hdmi_init(dev, reg);
}
} else
intel_dvo_init(dev);
--
1.6.0.4



\
 
 \ /
  Last update: 2009-04-14 17:13    [W:0.024 / U:10.204 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site