lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 422/477] drm/dp_mst: Reformat drm_dp_check_act_status() a bit
    Date
    From: Lyude Paul <lyude@redhat.com>

    commit a5cb5fa6c3a5c2cf492db667b8670ee7b044b79f upstream.

    Just add a bit more line wrapping, get rid of some extraneous
    whitespace, remove an unneeded goto label, and move around some variable
    declarations. No functional changes here.

    Signed-off-by: Lyude Paul <lyude@redhat.com>
    [this isn't a fix, but it's needed for the fix that comes after this]
    Fixes: ad7f8a1f9ced ("drm/helper: add Displayport multi-stream helper (v0.6)")
    Cc: Sean Paul <sean@poorly.run>
    Cc: <stable@vger.kernel.org> # v3.17+
    Reviewed-by: Sean Paul <sean@poorly.run>
    Link: https://patchwork.freedesktop.org/patch/msgid/20200406221253.1307209-3-lyude@redhat.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/drm_dp_mst_topology.c | 22 ++++++++++------------
    1 file changed, 10 insertions(+), 12 deletions(-)

    --- a/drivers/gpu/drm/drm_dp_mst_topology.c
    +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
    @@ -4457,33 +4457,31 @@ fail:
    */
    int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr)
    {
    + int count = 0, ret;
    u8 status;
    - int ret;
    - int count = 0;

    do {
    - ret = drm_dp_dpcd_readb(mgr->aux, DP_PAYLOAD_TABLE_UPDATE_STATUS, &status);
    -
    + ret = drm_dp_dpcd_readb(mgr->aux,
    + DP_PAYLOAD_TABLE_UPDATE_STATUS,
    + &status);
    if (ret < 0) {
    - DRM_DEBUG_KMS("failed to read payload table status %d\n", ret);
    - goto fail;
    + DRM_DEBUG_KMS("failed to read payload table status %d\n",
    + ret);
    + return ret;
    }

    if (status & DP_PAYLOAD_ACT_HANDLED)
    break;
    count++;
    udelay(100);
    -
    } while (count < 30);

    if (!(status & DP_PAYLOAD_ACT_HANDLED)) {
    - DRM_DEBUG_KMS("failed to get ACT bit %d after %d retries\n", status, count);
    - ret = -EINVAL;
    - goto fail;
    + DRM_DEBUG_KMS("failed to get ACT bit %d after %d retries\n",
    + status, count);
    + return -EINVAL;
    }
    return 0;
    -fail:
    - return ret;
    }
    EXPORT_SYMBOL(drm_dp_check_act_status);


    \
     
     \ /
      Last update: 2020-06-23 22:19    [W:2.937 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site