backlight/video: Use Platform getter/setter functions

Use getter and setter functions, for platform_device structures and a
spi_device structure.

Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/video/backlight/qcom-wled.c b/drivers/video/backlight/qcom-wled.c
index 3bc7800eb0a93759ce07b1057bc50ceb0ff7f8ed..091f07e7c1451a893842a38ad956612ecd5ce054 100644 (file)
--- 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
index 226682550b4b9d86747c8b99bd680fae4abb339f..6e07a97bbd31a1dddc89105219894ac86e8f9a51 100644 (file)
--- a/drivers/video/fbdev/amifb.c
+++ b/drivers/video/fbdev/amifb.c
@@ -3736,7 +3736,7 @@ default_chipset:
        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 @@ release:
 
 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
index e38c0e3f9c61423e5f506a264bdfbf52dcf76e9d..005ac3c17aa1f0696d38d132959e601ab8990497 100644 (file)
--- 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
index 884b16efa7e8a93eae6d3b628e11d46142373d30..7f8debd2da065cab20d0e83cea154a7d5e66c69c 100644 (file)
--- 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
index 0f93a260e4325dfd36239e843ba64c15be411a85..1bec7a4422e8056b468455ed12889ffb1e372be1 100644 (file)
--- 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 @@ err_gpio:
 
 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
index e2e7fe6f89eed597776a87d63c15e8f287e1ac3e..99ce6e955a46a1044be30ca4145bdd7db0a3f56b 100644 (file)
--- 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
index 6f9c25fec994694495ef666360b7090acc3252aa..573ddd37010f2fa0002cc0cb5319153ec971da6f 100644 (file)
--- 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
index 496b43bdad211dab5033c6a2cbaf99130b1d258f..800bd108e834d4b721983f80cb753451a4c8caa2 100644 (file)
--- 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
index e3d441ade241d2be5b6b7c2e767bcd41ce128917..2c03608addcd788f6742244b34dd0bd3ca89b5e2 100644 (file)
--- 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
index ca4ff658cad041230b664cd698436689b30483bf..ffbf900648d90ef79742780fb89d6a2e62098842 100644 (file)
--- 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);
 }