aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_sdvo.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2015-09-18 13:03:14 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-09-23 11:12:42 -0400
commit8bd864b81a7472a19eb6ed536e028a10e7d71239 (patch)
tree1acbd83666f56491acc71e284292b9a7e8d74dc3 /drivers/gpu/drm/i915/intel_sdvo.c
parent972e7d71c82ea70100b808695d5cf735c1df5ef8 (diff)
drm/i915: Don't pass sdvo_reg to intel_sdvo_select_{ddc, i2c}_bus()
intel_sdvo_select_ddc_bus() and intel_sdvo_select_i2c_bus() have no used for the passed in 'reg', so just drop it. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
-rw-r--r--drivers/gpu/drm/i915/intel_sdvo.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index ca3dd7c682bd..05521b5c6878 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -2222,7 +2222,7 @@ intel_sdvo_guess_ddc_bus(struct intel_sdvo *sdvo)
2222 */ 2222 */
2223static void 2223static void
2224intel_sdvo_select_ddc_bus(struct drm_i915_private *dev_priv, 2224intel_sdvo_select_ddc_bus(struct drm_i915_private *dev_priv,
2225 struct intel_sdvo *sdvo, u32 reg) 2225 struct intel_sdvo *sdvo)
2226{ 2226{
2227 struct sdvo_device_mapping *mapping; 2227 struct sdvo_device_mapping *mapping;
2228 2228
@@ -2239,7 +2239,7 @@ intel_sdvo_select_ddc_bus(struct drm_i915_private *dev_priv,
2239 2239
2240static void 2240static void
2241intel_sdvo_select_i2c_bus(struct drm_i915_private *dev_priv, 2241intel_sdvo_select_i2c_bus(struct drm_i915_private *dev_priv,
2242 struct intel_sdvo *sdvo, u32 reg) 2242 struct intel_sdvo *sdvo)
2243{ 2243{
2244 struct sdvo_device_mapping *mapping; 2244 struct sdvo_device_mapping *mapping;
2245 u8 pin; 2245 u8 pin;
@@ -2925,7 +2925,7 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob)
2925 intel_sdvo->sdvo_reg = sdvo_reg; 2925 intel_sdvo->sdvo_reg = sdvo_reg;
2926 intel_sdvo->is_sdvob = is_sdvob; 2926 intel_sdvo->is_sdvob = is_sdvob;
2927 intel_sdvo->slave_addr = intel_sdvo_get_slave_addr(dev, intel_sdvo) >> 1; 2927 intel_sdvo->slave_addr = intel_sdvo_get_slave_addr(dev, intel_sdvo) >> 1;
2928 intel_sdvo_select_i2c_bus(dev_priv, intel_sdvo, sdvo_reg); 2928 intel_sdvo_select_i2c_bus(dev_priv, intel_sdvo);
2929 if (!intel_sdvo_init_ddc_proxy(intel_sdvo, dev)) 2929 if (!intel_sdvo_init_ddc_proxy(intel_sdvo, dev))
2930 goto err_i2c_bus; 2930 goto err_i2c_bus;
2931 2931
@@ -2987,7 +2987,7 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob)
2987 */ 2987 */
2988 intel_sdvo->base.cloneable = 0; 2988 intel_sdvo->base.cloneable = 0;
2989 2989
2990 intel_sdvo_select_ddc_bus(dev_priv, intel_sdvo, sdvo_reg); 2990 intel_sdvo_select_ddc_bus(dev_priv, intel_sdvo);
2991 2991
2992 /* Set the input timing to the screen. Assume always input 0. */ 2992 /* Set the input timing to the screen. Assume always input 0. */
2993 if (!intel_sdvo_set_target_input(intel_sdvo)) 2993 if (!intel_sdvo_set_target_input(intel_sdvo))