backlight/video: Use Platform getter/setter functions

JuliaLawall · Lee Jones · commit 0b5e0f45af40 · 2021-02-12T10:01:45.000Z
Use getter and setter functions, for platform_device structures and a
spi_device structure.

Signed-off-by: Julia Lawall &lt;Julia.Lawall@inria.fr&gt;
Acked-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt;
Signed-off-by: Lee Jones &lt;lee.jones@linaro.org&gt;
diff --git a/drivers/video/backlight/qcom-wled.c b/drivers/video/backlight/qcom-wled.c
@@ -1692,7 +1692,7 @@ static int wled_probe(struct platform_device *pdev)
 
 static int wled_remove(struct platform_device *pdev)
 {
-	struct wled *wled = dev_get_drvdata(&pdev->dev);
+	struct wled *wled = platform_get_drvdata(pdev);
 
 	mutex_destroy(&wled->lock);
 	cancel_delayed_work_sync(&wled->ovp_work);
diff --git a/drivers/video/fbdev/amifb.c b/drivers/video/fbdev/amifb.c
@@ -3736,7 +3736,7 @@ static int __init amifb_probe(struct platform_device *pdev)
 	if (err)
 		goto free_irq;
 
-	dev_set_drvdata(&pdev->dev, info);
+	platform_set_drvdata(pdev, info);
 
 	err = register_framebuffer(info);
 	if (err)
@@ -3764,7 +3764,7 @@ static int __init amifb_probe(struct platform_device *pdev)
 
 static int __exit amifb_remove(struct platform_device *pdev)
 {
-	struct fb_info *info = dev_get_drvdata(&pdev->dev);
+	struct fb_info *info = platform_get_drvdata(pdev);
 
 	unregister_framebuffer(info);
 	fb_dealloc_cmap(&info->cmap);
diff --git a/drivers/video/fbdev/da8xx-fb.c b/drivers/video/fbdev/da8xx-fb.c
@@ -1066,7 +1066,7 @@ static void lcd_da8xx_cpufreq_deregister(struct da8xx_fb_par *par)
 
 static int fb_remove(struct platform_device *dev)
 {
-	struct fb_info *info = dev_get_drvdata(&dev->dev);
+	struct fb_info *info = platform_get_drvdata(dev);
 	struct da8xx_fb_par *par = info->par;
 	int ret;
 
@@ -1482,7 +1482,7 @@ static int fb_probe(struct platform_device *device)
 	da8xx_fb_var.activate = FB_ACTIVATE_FORCE;
 	fb_set_var(da8xx_fb_info, &da8xx_fb_var);
 
-	dev_set_drvdata(&device->dev, da8xx_fb_info);
+	platform_set_drvdata(device, da8xx_fb_info);
 
 	/* initialize the vsync wait queue */
 	init_waitqueue_head(&par->vsync_wait);
diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
@@ -657,7 +657,7 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
 static int imxfb_init_fbinfo(struct platform_device *pdev)
 {
 	struct imx_fb_platform_data *pdata = dev_get_platdata(&pdev->dev);
-	struct fb_info *info = dev_get_drvdata(&pdev->dev);
+	struct fb_info *info = platform_get_drvdata(pdev);
 	struct imxfb_info *fbi = info->par;
 	struct device_node *np;
 
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c
@@ -239,7 +239,7 @@ static struct omap_dss_driver lb035q02_ops = {
 static int lb035q02_probe_of(struct spi_device *spi)
 {
 	struct device_node *node = spi->dev.of_node;
-	struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
+	struct panel_drv_data *ddata = spi_get_drvdata(spi);
 	struct omap_dss_device *in;
 	struct gpio_desc *gpio;
 
@@ -277,7 +277,7 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
 	if (ddata == NULL)
 		return -ENOMEM;
 
-	dev_set_drvdata(&spi->dev, ddata);
+	spi_set_drvdata(spi, ddata);
 
 	ddata->spi = spi;
 
@@ -318,7 +318,7 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
 
 static int lb035q02_panel_spi_remove(struct spi_device *spi)
 {
-	struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
+	struct panel_drv_data *ddata = spi_get_drvdata(spi);
 	struct omap_dss_device *dssdev = &ddata->dssdev;
 	struct omap_dss_device *in = ddata->in;
 
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dpi.c b/drivers/video/fbdev/omap2/omapfb/dss/dpi.c
@@ -55,7 +55,7 @@ static struct dpi_data *dpi_get_data_from_dssdev(struct omap_dss_device *dssdev)
 /* only used in non-DT mode */
 static struct dpi_data *dpi_get_data_from_pdev(struct platform_device *pdev)
 {
-	return dev_get_drvdata(&pdev->dev);
+	return platform_get_drvdata(pdev);
 }
 
 static struct dss_pll *dpi_get_pll(enum omap_channel channel)
@@ -784,7 +784,7 @@ static int dpi_bind(struct device *dev, struct device *master, void *data)
 
 	dpi->pdev = pdev;
 
-	dev_set_drvdata(&pdev->dev, dpi);
+	platform_set_drvdata(pdev, dpi);
 
 	mutex_init(&dpi->lock);
 
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
@@ -399,7 +399,7 @@ module_param(dsi_perf, bool, 0644);
 
 static inline struct dsi_data *dsi_get_dsidrv_data(struct platform_device *dsidev)
 {
-	return dev_get_drvdata(&dsidev->dev);
+	return platform_get_drvdata(dsidev);
 }
 
 static inline struct platform_device *dsi_get_dsidev_from_dssdev(struct omap_dss_device *dssdev)
@@ -5272,7 +5272,7 @@ static int dsi_bind(struct device *dev, struct device *master, void *data)
 		return -ENOMEM;
 
 	dsi->pdev = dsidev;
-	dev_set_drvdata(&dsidev->dev, dsi);
+	platform_set_drvdata(dsidev, dsi);
 
 	spin_lock_init(&dsi->irq_lock);
 	spin_lock_init(&dsi->errors_lock);
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
@@ -672,7 +672,7 @@ static int hdmi4_bind(struct device *dev, struct device *master, void *data)
 	int irq;
 
 	hdmi.pdev = pdev;
-	dev_set_drvdata(&pdev->dev, &hdmi);
+	platform_set_drvdata(pdev, &hdmi);
 
 	mutex_init(&hdmi.lock);
 	spin_lock_init(&hdmi.audio_playing_lock);
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
@@ -713,7 +713,7 @@ static int hdmi5_bind(struct device *dev, struct device *master, void *data)
 	int irq;
 
 	hdmi.pdev = pdev;
-	dev_set_drvdata(&pdev->dev, &hdmi);
+	platform_set_drvdata(pdev, &hdmi);
 
 	mutex_init(&hdmi.lock);
 	spin_lock_init(&hdmi.audio_playing_lock);
diff --git a/drivers/video/fbdev/xilinxfb.c b/drivers/video/fbdev/xilinxfb.c
@@ -472,7 +472,7 @@ static int xilinxfb_of_probe(struct platform_device *pdev)
 	if (of_find_property(pdev->dev.of_node, "rotate-display", NULL))
 		pdata.rotate_screen = 1;
 
-	dev_set_drvdata(&pdev->dev, drvdata);
+	platform_set_drvdata(pdev, drvdata);
 	return xilinxfb_assign(pdev, drvdata, &pdata);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1692,7 +1692,7 @@ static int wled_probe(struct platform_device *pdev)`
`1692`	`1692`
`1693`	`1693`	`static int wled_remove(struct platform_device *pdev)`
`1694`	`1694`	`{`
`1695`		`- struct wled *wled = dev_get_drvdata(&pdev->dev);`
	`1695`	`+ struct wled *wled = platform_get_drvdata(pdev);`
`1696`	`1696`
`1697`	`1697`	`mutex_destroy(&wled->lock);`
`1698`	`1698`	`cancel_delayed_work_sync(&wled->ovp_work);`
Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,7 @@ static int imxfb_activate_var(struct fb_var_screeninfo var, struct fb_info inf`
`657`	`657`	`static int imxfb_init_fbinfo(struct platform_device *pdev)`
`658`	`658`	`{`
`659`	`659`	`struct imx_fb_platform_data *pdata = dev_get_platdata(&pdev->dev);`
`660`		`- struct fb_info *info = dev_get_drvdata(&pdev->dev);`
	`660`	`+ struct fb_info *info = platform_get_drvdata(pdev);`
`661`	`661`	`struct imxfb_info *fbi = info->par;`
`662`	`662`	`struct device_node *np;`
`663`	`663`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ static struct dpi_data dpi_get_data_from_dssdev(struct omap_dss_device dssdev)`
`55`	`55`	`/* only used in non-DT mode */`
`56`	`56`	`static struct dpi_data dpi_get_data_from_pdev(struct platform_device pdev)`
`57`	`57`	`{`
`58`		`- return dev_get_drvdata(&pdev->dev);`
	`58`	`+ return platform_get_drvdata(pdev);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`static struct dss_pll *dpi_get_pll(enum omap_channel channel)`
`@@ -784,7 +784,7 @@ static int dpi_bind(struct device dev, struct device master, void *data)`
`784`	`784`
`785`	`785`	`dpi->pdev = pdev;`
`786`	`786`
`787`		`- dev_set_drvdata(&pdev->dev, dpi);`
	`787`	`+ platform_set_drvdata(pdev, dpi);`
`788`	`788`
`789`	`789`	`mutex_init(&dpi->lock);`
`790`	`790`
Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ module_param(dsi_perf, bool, 0644);`
`399`	`399`
`400`	`400`	`static inline struct dsi_data dsi_get_dsidrv_data(struct platform_device dsidev)`
`401`	`401`	`{`
`402`		`- return dev_get_drvdata(&dsidev->dev);`
	`402`	`+ return platform_get_drvdata(dsidev);`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`static inline struct platform_device dsi_get_dsidev_from_dssdev(struct omap_dss_device dssdev)`
`@@ -5272,7 +5272,7 @@ static int dsi_bind(struct device dev, struct device master, void *data)`
`5272`	`5272`	`return -ENOMEM;`
`5273`	`5273`
`5274`	`5274`	`dsi->pdev = dsidev;`
`5275`		`- dev_set_drvdata(&dsidev->dev, dsi);`
	`5275`	`+ platform_set_drvdata(dsidev, dsi);`
`5276`	`5276`
`5277`	`5277`	`spin_lock_init(&dsi->irq_lock);`
`5278`	`5278`	`spin_lock_init(&dsi->errors_lock);`
Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ static int xilinxfb_of_probe(struct platform_device *pdev)`
`472`	`472`	`if (of_find_property(pdev->dev.of_node, "rotate-display", NULL))`
`473`	`473`	`pdata.rotate_screen = 1;`
`474`	`474`
`475`		`- dev_set_drvdata(&pdev->dev, drvdata);`
	`475`	`+ platform_set_drvdata(pdev, drvdata);`
`476`	`476`	`return xilinxfb_assign(pdev, drvdata, &pdata);`
`477`	`477`	`}`
`478`	`478`