lkml.org 
[lkml]   [2018]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 21/24] drm/sti: provide an .owner device for the bridges
    Date
    The .of_node member is going away and providing an .owner will become
    mandatory.

    Signed-off-by: Peter Rosin <peda@axentia.se>
    ---
    drivers/gpu/drm/sti/sti_dvo.c | 2 +-
    drivers/gpu/drm/sti/sti_hda.c | 1 +
    drivers/gpu/drm/sti/sti_hdmi.c | 1 +
    3 files changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
    index a5979cd25cc7..aa390053de16 100644
    --- a/drivers/gpu/drm/sti/sti_dvo.c
    +++ b/drivers/gpu/drm/sti/sti_dvo.c
    @@ -460,9 +460,9 @@ static int sti_dvo_bind(struct device *dev, struct device *master, void *data)
    if (!bridge)
    return -ENOMEM;

    + bridge->owner = &dvo->dev;
    bridge->driver_private = dvo;
    bridge->funcs = &sti_dvo_bridge_funcs;
    - bridge->of_node = dvo->dev.of_node;
    drm_bridge_add(bridge);

    err = drm_bridge_attach(encoder, bridge, NULL);
    diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c
    index 67bbdb49fffc..f45623628c95 100644
    --- a/drivers/gpu/drm/sti/sti_hda.c
    +++ b/drivers/gpu/drm/sti/sti_hda.c
    @@ -694,6 +694,7 @@ static int sti_hda_bind(struct device *dev, struct device *master, void *data)
    if (!bridge)
    return -ENOMEM;

    + bridge->owner = dev;
    bridge->driver_private = hda;
    bridge->funcs = &sti_hda_bridge_funcs;
    drm_bridge_attach(encoder, bridge, NULL);
    diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
    index 58f431102512..3989cafd1c23 100644
    --- a/drivers/gpu/drm/sti/sti_hdmi.c
    +++ b/drivers/gpu/drm/sti/sti_hdmi.c
    @@ -1270,6 +1270,7 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)
    if (!bridge)
    return -EINVAL;

    + bridge->owner = dev;
    bridge->driver_private = hdmi;
    bridge->funcs = &sti_hdmi_bridge_funcs;
    drm_bridge_attach(encoder, bridge, NULL);
    --
    2.11.0
    \
     
     \ /
      Last update: 2018-04-27 00:35    [W:3.454 / U:0.516 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site