tosa_battery: Fix build error due to direct driver_data usage
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Tue, 27 Apr 2010 13:18:22 +0000 (17:18 +0400)
committerAnton Vorontsov <cbouatmailru@gmail.com>
Sun, 2 May 2010 20:02:56 +0000 (00:02 +0400)
The driver isn't buildable since 2.6.32 (i.e. commit b4028437
"Driver core: move dev_get/set_drvdata to drivers/base/dd.c"):

  CC      tosa_battery.o
tosa_battery.c: In function 'tosa_read_bat':
tosa_battery.c:64: error: 'struct device' has no member named 'driver_data'
tosa_battery.c: In function 'tosa_read_temp':
tosa_battery.c:84: error: 'struct device' has no member named 'driver_data'

Nowadays we must not access driver_data directly, use dev_get_drvdata()
instead.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
drivers/power/tosa_battery.c

index 2eab35a..ee04936 100644 (file)
@@ -61,7 +61,7 @@ static unsigned long tosa_read_bat(struct tosa_bat *bat)
        mutex_lock(&bat_lock);
        gpio_set_value(bat->gpio_bat, 1);
        msleep(5);
-       value = wm97xx_read_aux_adc(bat->psy.dev->parent->driver_data,
+       value = wm97xx_read_aux_adc(dev_get_drvdata(bat->psy.dev->parent),
                        bat->adc_bat);
        gpio_set_value(bat->gpio_bat, 0);
        mutex_unlock(&bat_lock);
@@ -81,7 +81,7 @@ static unsigned long tosa_read_temp(struct tosa_bat *bat)
        mutex_lock(&bat_lock);
        gpio_set_value(bat->gpio_temp, 1);
        msleep(5);
-       value = wm97xx_read_aux_adc(bat->psy.dev->parent->driver_data,
+       value = wm97xx_read_aux_adc(dev_get_drvdata(bat->psy.dev->parent),
                        bat->adc_temp);
        gpio_set_value(bat->gpio_temp, 0);
        mutex_unlock(&bat_lock);