lkml.org 
[lkml]   [2021]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 14/21] drm/bridge: sn65dsi83: Switch to devm MIPI-DSI helpers
    Date
    Let's switch to the new devm MIPI-DSI function to register and attach
    our secondary device. This also avoids leaking the device when we detach
    the bridge but don't remove its driver.

    Acked-by: Sam Ravnborg <sam@ravnborg.org>
    Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Maxime Ripard <maxime@cerno.tech>
    ---
    drivers/gpu/drm/bridge/ti-sn65dsi83.c | 12 +++---------
    1 file changed, 3 insertions(+), 9 deletions(-)

    diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi83.c b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
    index 3bfd07caf8d7..539edd2c19f5 100644
    --- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c
    +++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
    @@ -262,7 +262,7 @@ static int sn65dsi83_attach(struct drm_bridge *bridge,
    return -EPROBE_DEFER;
    }

    - dsi = mipi_dsi_device_register_full(host, &info);
    + dsi = devm_mipi_dsi_device_register_full(dev, host, &info);
    if (IS_ERR(dsi)) {
    return dev_err_probe(dev, PTR_ERR(dsi),
    "failed to create dsi device\n");
    @@ -274,18 +274,14 @@ static int sn65dsi83_attach(struct drm_bridge *bridge,
    dsi->format = MIPI_DSI_FMT_RGB888;
    dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST;

    - ret = mipi_dsi_attach(dsi);
    + ret = devm_mipi_dsi_attach(dev, dsi);
    if (ret < 0) {
    dev_err(dev, "failed to attach dsi to host\n");
    - goto err_dsi_attach;
    + return ret;
    }

    return drm_bridge_attach(bridge->encoder, ctx->panel_bridge,
    &ctx->bridge, flags);
    -
    -err_dsi_attach:
    - mipi_dsi_device_unregister(dsi);
    - return ret;
    }

    static void sn65dsi83_detach(struct drm_bridge *bridge)
    @@ -295,8 +291,6 @@ static void sn65dsi83_detach(struct drm_bridge *bridge)
    if (!ctx->dsi)
    return;

    - mipi_dsi_detach(ctx->dsi);
    - mipi_dsi_device_unregister(ctx->dsi);
    ctx->dsi = NULL;
    }

    --
    2.31.1
    \
     
     \ /
      Last update: 2021-10-25 17:17    [W:4.132 / U:1.548 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site