diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-04-27 15:18:22 +0200 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-05-02 22:02:56 +0200 |
| commit | 06b9e650ce5eaf14ac1486b2f05baaf2ba22ad22 (patch) | |
| tree | 5ab82cff7ea81237f55393bd7c2dcb974ed731d9 /drivers | |
| parent | wm97xx_battery: Quieten sparse warning (bat_set_pdata not declared) (diff) | |
| download | linux-06b9e650ce5eaf14ac1486b2f05baaf2ba22ad22.tar.xz linux-06b9e650ce5eaf14ac1486b2f05baaf2ba22ad22.zip | |
tosa_battery: Fix build error due to direct driver_data usage
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/tosa_battery.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/tosa_battery.c b/drivers/power/tosa_battery.c index 2eab35aab311..ee04936b2db5 100644 --- a/drivers/power/tosa_battery.c +++ b/drivers/power/tosa_battery.c @@ -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); |