From a4486a21a3016676345c6f671b32f4d2d4bc7482 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Tue, 27 Apr 2010 17:18:22 +0400 Subject: [PATCH] --- yaml --- r: 198151 b: refs/heads/master c: 06b9e650ce5eaf14ac1486b2f05baaf2ba22ad22 h: refs/heads/master i: 198149: 55aef4e0e4d3a32341fb7d07749a1d4625fb1410 198147: 38aeeeecf912f76f822dea934ac73ca90ea9d36b 198143: 5c45800241cd1c8ff13308817ad501e2c582e831 v: v3 --- [refs] | 2 +- trunk/drivers/power/tosa_battery.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b67d7546f4d1..0b347cc9b6ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1458fb57de03b19296cac70e9455b05912782b5 +refs/heads/master: 06b9e650ce5eaf14ac1486b2f05baaf2ba22ad22 diff --git a/trunk/drivers/power/tosa_battery.c b/trunk/drivers/power/tosa_battery.c index 2eab35aab311..ee04936b2db5 100644 --- a/trunk/drivers/power/tosa_battery.c +++ b/trunk/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);