drm/i915: Add missing 'else' to intel_digital_port_connected()

vsyrjala · vsyrjala · commit 22824fac947b · 2016-02-15T19:10:41.000+02:00
intel_digital_port_connected() lacks one 'else'. There's no actual harm in not having it since each branch has an unconditional return, so it can't accidentally end up in taking two branches instead of just the one. But let's be consistent and add the 'else' anyway. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1455201868-31527-1-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com>
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
@@ -4561,7 +4561,7 @@ bool intel_digital_port_connected(struct drm_i915_private *dev_priv,
 {
 	if (HAS_PCH_IBX(dev_priv))
 		return ibx_digital_port_connected(dev_priv, port);
-	if (HAS_PCH_SPLIT(dev_priv))
+	else if (HAS_PCH_SPLIT(dev_priv))
 		return cpt_digital_port_connected(dev_priv, port);
 	else if (IS_BROXTON(dev_priv))
 		return bxt_digital_port_connected(dev_priv, port);

Original file line number	Diff line number	Diff line change
`@@ -4561,7 +4561,7 @@ bool intel_digital_port_connected(struct drm_i915_private *dev_priv,`
`4561`	`4561`	`{`
`4562`	`4562`	`if (HAS_PCH_IBX(dev_priv))`
`4563`	`4563`	`return ibx_digital_port_connected(dev_priv, port);`
`4564`		`- if (HAS_PCH_SPLIT(dev_priv))`
	`4564`	`+ else if (HAS_PCH_SPLIT(dev_priv))`
`4565`	`4565`	`return cpt_digital_port_connected(dev_priv, port);`
`4566`	`4566`	`else if (IS_BROXTON(dev_priv))`
`4567`	`4567`	`return bxt_digital_port_connected(dev_priv, port);`