author | Anton Vorontsov <avorontsov@ru.mvista.com> | |
Tue, 22 Sep 2009 23:49:27 +0000 (03:49 +0400) | ||
committer | Anton Vorontsov <avorontsov@ru.mvista.com> | |
Tue, 22 Sep 2009 23:49:27 +0000 (03:49 +0400) |
Conflicts:
drivers/power/wm97xx_battery.c
drivers/power/wm97xx_battery.c
1 | 2 | |||
---|---|---|---|---|
drivers/input/touchscreen/wm97xx-core.c | patch | | diff1 | | diff2 | | blob | history |
drivers/power/wm97xx_battery.c | patch | | diff1 | | diff2 | | blob | history |
include/linux/wm97xx.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc drivers/input/touchscreen/wm97xx-core.c
Simple merge
diff --cc drivers/power/wm97xx_battery.c
index c552082c8128a0d8f7e9f2f5290a7012f3ab4351,b787335a8419352fa4cef23af9fccd2fd4f508ac..f2bfd296dbae05133134b02c05daf9df12da6fa0
static unsigned long wm97xx_read_bat(struct power_supply *bat_ps)
{
- return wm97xx_read_aux_adc(bat_ps->dev->parent->driver_data,
+ struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data;
+ struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
+
+ 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,
+ struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data;
+ struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
+
+ return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent),
pdata->temp_aux) * pdata->temp_mult /
pdata->temp_div;
}
diff --cc include/linux/wm97xx.h
Simple merge