lkml.org 
[lkml]   [2011]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/4] drm/i915: Remove unused 'reg' argument to dp_pipe_enabled
    Date
    Just an extra parameter which isn't actually needed.

    Signed-off-by: Keith Packard <keithp@keithp.com>
    ---
    drivers/gpu/drm/i915/intel_display.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
    index 4c4c903..f6f18c7 100644
    --- a/drivers/gpu/drm/i915/intel_display.c
    +++ b/drivers/gpu/drm/i915/intel_display.c
    @@ -980,8 +980,8 @@ static void assert_transcoder_disabled(struct drm_i915_private *dev_priv,
    pipe_name(pipe));
    }

    -static bool dp_pipe_enabled(struct drm_i915_private *dev_priv, enum pipe pipe,
    - int reg, u32 port_sel, u32 val)
    +static bool dp_pipe_enabled(struct drm_i915_private *dev_priv,
    + enum pipe pipe, u32 port_sel, u32 val)
    {
    if ((val & DP_PORT_EN) == 0)
    return false;
    @@ -1049,7 +1049,7 @@ static void assert_pch_dp_disabled(struct drm_i915_private *dev_priv,
    enum pipe pipe, int reg, u32 port_sel)
    {
    u32 val = I915_READ(reg);
    - WARN(dp_pipe_enabled(dev_priv, pipe, reg, port_sel, val),
    + WARN(dp_pipe_enabled(dev_priv, pipe, port_sel, val),
    "PCH DP (0x%08x) enabled on transcoder %c, should be disabled\n",
    reg, pipe_name(pipe));
    }
    @@ -1407,7 +1407,7 @@ static void disable_pch_dp(struct drm_i915_private *dev_priv,
    enum pipe pipe, int reg, u32 port_sel)
    {
    u32 val = I915_READ(reg);
    - if (dp_pipe_enabled(dev_priv, pipe, reg, port_sel, val)) {
    + if (dp_pipe_enabled(dev_priv, pipe, port_sel, val)) {
    DRM_DEBUG_KMS("Disabling pch dp %x on pipe %d\n", reg, pipe);
    I915_WRITE(reg, val & ~DP_PORT_EN);
    }
    --
    1.7.5.4


    \
     
     \ /
      Last update: 2011-08-06 19:57    [W:0.021 / U:0.564 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site