From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Anton Vorontsov <avorontsov@ru•mvista.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Marek Vasut <marek.vasut@gmail•com>,
Alexander Beregalov <a.beregalov@gmail•com>,
Greg Kroah-Hartman <gregkh@suse•de>
Subject: linux-next: manual merge of the battery tree with Linus' tree
Date: Mon, 7 Sep 2009 14:52:01 +1000 [thread overview]
Message-ID: <20090907145201.34704d7b.sfr@canb.auug.org.au> (raw)
Hi Anton,
Today's linux-next merge of the battery tree got a conflict in
drivers/power/wm97xx_battery.c between commit
38c7dc373029e4666b17850054dd43c1c96bb264 ("wm97xx_batery: replace
driver_data with dev_get_drvdata()") from Linus' tree and commit
b8bdc1d0cfc488ac0d94724639f9a61b0a5a1d40 ("wm97xx_battery: Use
platform_data") from the battery tree.
Just context changes. I fixed it up (see below) and can carry the fixes
for a while.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/power/wm97xx_battery.c
index b787335,c552082c..0000000
--- a/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@@ -33,14 -33,20 +33,20 @@@ static enum power_supply_property *prop
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;
}
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;
}
next reply other threads:[~2009-09-07 4:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-07 4:52 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-01-30 11:13 linux-next: manual merge of the battery tree with Linus' tree Stephen Rothwell
2025-11-27 0:30 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090907145201.34704d7b.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=a.beregalov@gmail$(echo .)com \
--cc=avorontsov@ru$(echo .)mvista.com \
--cc=gregkh@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marek.vasut@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox