linux-kernel - [PATCH] [drm] Remove duplicated code

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <1239720620-6082-2-git-send-email-jonas@southpole.se>
Date:	Tue, 14 Apr 2009 16:50:20 +0200
From:	Jonas Bonn <jonas@...thpole.se>
To:	dri-devel@...ts.sourceforge.net
Cc:	linux-kernel@...r.kernel.org, Jonas Bonn <jonas@...thpole.se>
Subject: [PATCH] [drm] Remove duplicated code

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@...thpole.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


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/