diff mbox

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

Message ID 20180216154412.22876-1-maxime.ripard@bootlin.com (mailing list archive)
State New, archived
Headers show

Commit Message

Maxime Ripard Feb. 16, 2018, 3:44 p.m. UTC
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>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
 drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Sean Paul Feb. 16, 2018, 3:53 p.m. UTC | #1
On Fri, Feb 16, 2018 at 04:44:12PM +0100, Maxime Ripard wrote:
> Commit eea034af90c6 ("drm/bridge/synopsys: dw-hdmi: don't clobber drvdata")
> broke the build with one build error and one warning. Fix both.

Reviewed-by: Sean Paul <seanpaul@chromium.org>

> 
> 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>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> ---
>  drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c b/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
> index 3bebc6821e9c..76210ae25094 100644
> --- 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);
>  
> -- 
> 2.14.3
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maxime Ripard Feb. 16, 2018, 6:25 p.m. UTC | #2
On Fri, Feb 16, 2018 at 10:53:08AM -0500, Sean Paul wrote:
> On Fri, Feb 16, 2018 at 04:44:12PM +0100, Maxime Ripard wrote:
> > Commit eea034af90c6 ("drm/bridge/synopsys: dw-hdmi: don't clobber drvdata")
> > broke the build with one build error and one warning. Fix both.
> 
> Reviewed-by: Sean Paul <seanpaul@chromium.org>

Pushed, sorry for the mess.

Maxime
Laurent Pinchart Feb. 19, 2018, 4:22 p.m. UTC | #3
Hi Maxime,

On Friday, 16 February 2018 17:44:12 EET Maxime Ripard wrote:
> 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>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>

A bit late as you've pushed the patch already, but

Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
> b/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c index 3bebc6821e9c..76210ae25094
> 100644
> --- 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);
diff mbox

Patch

diff --git a/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c b/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
index 3bebc6821e9c..76210ae25094 100644
--- 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);