1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c
index e323fcbe884e..aa782f302983 100644
--- a/drivers/video/backlight/corgi_lcd.c
+++ b/drivers/video/backlight/corgi_lcd.c
@@ -337,7 +337,7 @@ static void corgi_lcd_power_off(struct corgi_lcd *lcd)
 
 static int corgi_lcd_set_mode(struct lcd_device *ld, struct fb_videomode *m)
 {
-        struct corgi_lcd *lcd = dev_get_drvdata(&ld->dev);
+        struct corgi_lcd *lcd = lcd_get_data(ld);
         int mode = CORGI_LCD_MODE_QVGA;
 
         if (m->xres == 640 || m->xres == 480)
@@ -364,7 +364,7 @@ static int corgi_lcd_set_mode(struct lcd_device *ld, struct fb_videomode *m)
 
 static int corgi_lcd_set_power(struct lcd_device *ld, int power)
 {
-        struct corgi_lcd *lcd = dev_get_drvdata(&ld->dev);
+        struct corgi_lcd *lcd = lcd_get_data(ld);
 
         if (POWER_IS_ON(power) && !POWER_IS_ON(lcd->power))
                 corgi_lcd_power_on(lcd);
@@ -378,7 +378,7 @@ static int corgi_lcd_set_power(struct lcd_device *ld, int power)
 
 static int corgi_lcd_get_power(struct lcd_device *ld)
 {
-        struct corgi_lcd *lcd = dev_get_drvdata(&ld->dev);
+        struct corgi_lcd *lcd = lcd_get_data(ld);
 
         return lcd->power;
 }
@@ -391,7 +391,7 @@ static struct lcd_ops corgi_lcd_ops = {
 
 static int corgi_bl_get_intensity(struct backlight_device *bd)
 {
-        struct corgi_lcd *lcd = dev_get_drvdata(&bd->dev);
+        struct corgi_lcd *lcd = bl_get_data(bd);
 
         return lcd->intensity;
 }
@@ -423,7 +423,7 @@ static int corgi_bl_set_intensity(struct corgi_lcd *lcd, int intensity)
 
 static int corgi_bl_update_status(struct backlight_device *bd)
 {
-        struct corgi_lcd *lcd = dev_get_drvdata(&bd->dev);
+        struct corgi_lcd *lcd = bl_get_data(bd);
         int intensity = bd->props.brightness;
 
         if (bd->props.power != FB_BLANK_UNBLANK)
@@ -460,7 +460,7 @@ static const struct backlight_ops corgi_bl_ops = {
 #ifdef CONFIG_PM
 static int corgi_lcd_suspend(struct spi_device *spi, pm_message_t state)
 {
-        struct corgi_lcd *lcd = dev_get_drvdata(&spi->dev);
+        struct corgi_lcd *lcd = spi_get_drvdata(spi);
 
         corgibl_flags |= CORGIBL_SUSPENDED;
         corgi_bl_set_intensity(lcd, 0);
@@ -470,7 +470,7 @@ static int corgi_lcd_suspend(struct spi_device *spi, pm_message_t state)
 
 static int corgi_lcd_resume(struct spi_device *spi)
 {
-        struct corgi_lcd *lcd = dev_get_drvdata(&spi->dev);
+        struct corgi_lcd *lcd = spi_get_drvdata(spi);
 
         corgibl_flags &= ~CORGIBL_SUSPENDED;
         corgi_lcd_set_power(lcd->lcd_dev, FB_BLANK_UNBLANK);
@@ -577,7 +577,7 @@ static int corgi_lcd_probe(struct spi_device *spi)
 
         lcd->kick_battery = pdata->kick_battery;
 
-        dev_set_drvdata(&spi->dev, lcd);
+        spi_set_drvdata(spi, lcd);
         corgi_lcd_set_power(lcd->lcd_dev, FB_BLANK_UNBLANK);
         backlight_update_status(lcd->bl_dev);
 
@@ -594,7 +594,7 @@ err_unregister_lcd:
 
 static int corgi_lcd_remove(struct spi_device *spi)
 {
-        struct corgi_lcd *lcd = dev_get_drvdata(&spi->dev);
+        struct corgi_lcd *lcd = spi_get_drvdata(spi);
 
         lcd->bl_dev->props.power = FB_BLANK_UNBLANK;
         lcd->bl_dev->props.brightness = 0;