From 608bb28e87734b5759f62b229548cc7b21fb41ae Mon Sep 17 00:00:00 2001 From: Alexander Beregalov Date: Tue, 23 Jun 2009 17:50:06 +0400 Subject: [PATCH] --- yaml --- r: 155415 b: refs/heads/master c: 38c7dc373029e4666b17850054dd43c1c96bb264 h: refs/heads/master i: 155413: 73db4e836560ec2af172cb1387897c12fdfdd94d 155411: 777fd4e6879e816474b83715ea532953063552ee 155407: f2dc9f5e93124069cd7f5a3fd91a73fb372b9081 v: v3 --- [refs] | 2 +- trunk/drivers/power/wm97xx_battery.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e7222ef962af..22e4f1eeb189 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e9a8bd65761bf0c1ee26d8514ef3e9ff22ee465 +refs/heads/master: 38c7dc373029e4666b17850054dd43c1c96bb264 diff --git a/trunk/drivers/power/wm97xx_battery.c b/trunk/drivers/power/wm97xx_battery.c index 8bde92126d34..b787335a8419 100644 --- a/trunk/drivers/power/wm97xx_battery.c +++ b/trunk/drivers/power/wm97xx_battery.c @@ -33,14 +33,14 @@ static enum power_supply_property *prop; static unsigned long wm97xx_read_bat(struct power_supply *bat_ps) { - return wm97xx_read_aux_adc(bat_ps->dev->parent->driver_data, + return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent), pdata->batt_aux) * pdata->batt_mult / pdata->batt_div; } static unsigned long wm97xx_read_temp(struct power_supply *bat_ps) { - return wm97xx_read_aux_adc(bat_ps->dev->parent->driver_data, + return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent), pdata->temp_aux) * pdata->temp_mult / pdata->temp_div; }