drm/rcar-du: dw-hdmi: Fix compilation

Commit eea034af90c6 ("drm/bridge/synopsys: dw-hdmi: don't clobber drvdata")
broke the build with one build error and one warning. Fix both.

Cc: Archit Taneja <architt@codeaurora.org>
Cc: Jernej Skrabec <jernej.skrabec@siol.net>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Fixes: eea034af90c6 ("drm/bridge/synopsys: dw-hdmi: don't clobber drvdata")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180216154412.22876-1-maxime.ripard@bootlin.com

diff --git a/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c b/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
index 3bebc6821e9cc6e835104489b95c22ed73d901e8..76210ae25094d4ba9b62d7dacbc12f03254d79ae 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
+++ b/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
@@ -75,11 +75,13 @@ static int rcar_dw_hdmi_probe(struct platform_device *pdev)
                return PTR_ERR(hdmi);
 
        platform_set_drvdata(pdev, hdmi);
+
+       return 0;
 }
 
 static int rcar_dw_hdmi_remove(struct platform_device *pdev)
 {
-       struct dw_hdmi *hdmi = platform_get_drvdata(dev);
+       struct dw_hdmi *hdmi = platform_get_drvdata(pdev);
 
        dw_hdmi_remove(hdmi);