lkml.org 
[lkml]   [2018]   [Jan]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v17 10/10] drm/omapdrm: Use of_find_backlight helper
    Replace of_find_backlight_by_node and of the code around it
    with of_find_backlight helper to avoid repetition of code.

    Signed-off-by: Meghana Madhyastha <meghana.madhyastha@gmail.com>
    ---
    changes in v17:
    -remove put_device() to avoid double put
    as we are using the devm version

    drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 21 +++++----------------
    1 file changed, 5 insertions(+), 16 deletions(-)

    diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
    index ac9596251..4d598167f 100644
    --- a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
    +++ b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
    @@ -183,19 +183,15 @@ static int panel_dpi_probe_of(struct platform_device *pdev)
    if (IS_ERR(ddata->vcc_supply))
    return PTR_ERR(ddata->vcc_supply);

    - bl_node = of_parse_phandle(node, "backlight", 0);
    - if (bl_node) {
    - ddata->backlight = of_find_backlight_by_node(bl_node);
    - of_node_put(bl_node);
    + ddata->backlight = of_find_backlight(bl_node);

    - if (!ddata->backlight)
    - return -EPROBE_DEFER;
    - }
    + if (IS_ERR(ddata->backlight))
    + return PTR_ERR(ddata->backlight);

    r = of_get_display_timing(node, "panel-timing", &timing);
    if (r) {
    dev_err(&pdev->dev, "failed to get video timing\n");
    - goto error_free_backlight;
    + return r;
    }

    videomode_from_timing(&timing, &ddata->vm);
    @@ -203,19 +199,12 @@ static int panel_dpi_probe_of(struct platform_device *pdev)
    in = omapdss_of_find_source_for_first_ep(node);
    if (IS_ERR(in)) {
    dev_err(&pdev->dev, "failed to find video source\n");
    - r = PTR_ERR(in);
    - goto error_free_backlight;
    + return PTR_ERR(in);
    }

    ddata->in = in;

    return 0;
    -
    -error_free_backlight:
    - if (ddata->backlight)
    - put_device(&ddata->backlight->dev);
    -
    - return r;
    }

    static int panel_dpi_probe(struct platform_device *pdev)
    --
    2.11.0
    \
     
     \ /
      Last update: 2018-01-19 11:49    [W:4.155 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site