]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/rockchip: dw_hdmi: Don't call platform_set_drvdata()
authorDouglas Anderson <dianders@chromium.org>
Mon, 7 Mar 2016 22:00:53 +0000 (14:00 -0800)
committerMark Yao <mark.yao@rock-chips.com>
Mon, 28 Mar 2016 06:48:32 +0000 (14:48 +0800)
The Rockchip dw_hdmi driver just called platform_set_drvdata() to get
your hopes up that maybe, somehow, you'd be able to retrieve the 'struct
rockchip_hdmi' from a pointer to the 'struct device'.  You can't.  When
we call dw_hdmi_bind() the main driver calls dev_set_drvdata(), which
clobbers our setting.

Let's just remove the platform_set_drvdata() to avoid dashing people's
hopes.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c

index 88776aba984eff2e6ab37d39af7259fd9cdd9569..d5cfef75fc80b96716a062543f1ae7d0565120e0 100644 (file)
@@ -271,8 +271,6 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
        if (!iores)
                return -ENXIO;
 
-       platform_set_drvdata(pdev, hdmi);
-
        encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node);
        /*
         * If we failed to find the CRTC(s) which this encoder is