Skip to contentSkip to conversation

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

PATCH In review Maxime Ripard 3 participants 4 messages Feb 16, 2018 – Feb 19, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc Jernej Skrabec <[email protected]>
Cc Laurent Pinchart <[email protected]>
Fixes eea034af90c6 ("drm/bridge/synopsys: dw-hdmi: don't clobber drvdata")
---
 drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c +3 -1
index 3bebc6821e9c..76210ae25094 100644
@@ -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);
 
Signature · 6 lines
2.14.3

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 1/1
#1 lore raw
Quoted 2 lines · Maxime Ripard

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

Quoted 37 lines
Cc Archit Taneja <[email protected]>
Cc Jernej Skrabec <[email protected]>
Cc Laurent Pinchart <[email protected]>
Fixes eea034af90c6 ("drm/bridge/synopsys: dw-hdmi: don't clobber drvdata")
---
 drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c +3 -1
index 3bebc6821e9c..76210ae25094 100644
@@ -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);
 
Signature · 6 lines
2.14.3

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#2 lore raw
Quoted 5 lines · Sean Paul
Quoted 2 lines · Maxime Ripard

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

Pushed, sorry for the mess.

Maxime

Signature · 3 lines
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Tested-by on v1 1/1
#3 lore raw
In reply to Maxime Ripard

Hi Maxime,

Quoted 9 lines · 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 <[email protected]>
Cc Jernej Skrabec <[email protected]>
Cc Laurent Pinchart <[email protected]>
Fixes eea034af90c6 ("drm/bridge/synopsys: dw-hdmi: don't clobber drvdata")

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

Quoted 23 lines
---
 drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c index 3bebc6821e9c..76210ae25094 100644

drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c +3 -1
@@ -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);
Signature · 8 lines
Regards,

Laurent Pinchart

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel