X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fpower%2Fwm97xx_battery.c;h=f2bfd296dbae05133134b02c05daf9df12da6fa0;hb=f056878332a91ed984a116bad4e7d49aefff9e6e;hp=c552082c8128a0d8f7e9f2f5290a7012f3ab4351;hpb=3961f7c3cf247eee5df7fabadc7a40f2deeb98f3;p=pandora-kernel.git diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c index c552082c8128..f2bfd296dbae 100644 --- a/drivers/power/wm97xx_battery.c +++ b/drivers/power/wm97xx_battery.c @@ -36,7 +36,7 @@ static unsigned long wm97xx_read_bat(struct power_supply *bat_ps) struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data; struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata; - 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; } @@ -46,7 +46,7 @@ static unsigned long wm97xx_read_temp(struct power_supply *bat_ps) struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data; struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata; - 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; }