From: Anton Vorontsov <anton@enomsg.org>
To: Lars-Peter Clausen <lars@metafoo.de>
Cc: David Woodhouse <dwmw2@infradead.org>,
linux-kernel@vger.kernel.org, Lee Jones <lee.jones@linaro.org>,
Arnd Bergmann <arnd@arndb.de>,
Linus Walleij <linus.walleij@linaro.org>
Subject: Re: [PATCH 4/5] power: pm2301_charger: Remove __dev* annotations
Date: Sun, 24 Mar 2013 20:09:56 -0700 [thread overview]
Message-ID: <20130325030956.GA16489@lizard> (raw)
In-Reply-To: <1362922449-27531-4-git-send-email-lars@metafoo.de>
On Sun, Mar 10, 2013 at 02:34:08PM +0100, Lars-Peter Clausen wrote:
> The removal of __devinit and friends seems to have overlapped with the addition
> of the pm2301_charger driver. Currently the driver fails to build with the
> following errors:
>
> drivers/power/pm2301_charger.c:843:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'pm2xxx_wall_charger_probe'
> drivers/power/pm2301_charger.c:1013:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'pm2xxx_wall_charger_remove'
> drivers/power/pm2301_charger.c:1049:11: error: 'pm2xxx_wall_charger_probe' undeclared here (not in a function)
> drivers/power/pm2301_charger.c:1050:2: error: implicit declaration of function '__devexit_p'
> drivers/power/pm2301_charger.c:1050:24: error: 'pm2xxx_wall_charger_remove' undeclared here (not in a function)
>
> This patch removes the __dev* annotations, which fixes the build errors.
>
> Cc: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Applied to battery-urgent.git, thanks a lot!
> ---
> drivers/power/pm2301_charger.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
> index ed48d75..ca424b8 100644
> --- a/drivers/power/pm2301_charger.c
> +++ b/drivers/power/pm2301_charger.c
> @@ -851,7 +851,7 @@ static int pm2xxx_wall_charger_suspend(struct i2c_client *i2c_client,
> return 0;
> }
>
> -static int __devinit pm2xxx_wall_charger_probe(struct i2c_client *i2c_client,
> +static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client,
> const struct i2c_device_id *id)
> {
> struct pm2xxx_platform_data *pl_data = i2c_client->dev.platform_data;
> @@ -1021,7 +1021,7 @@ free_device_info:
> return ret;
> }
>
> -static int __devexit pm2xxx_wall_charger_remove(struct i2c_client *i2c_client)
> +static int pm2xxx_wall_charger_remove(struct i2c_client *i2c_client)
> {
> struct pm2xxx_charger *pm2 = i2c_get_clientdata(i2c_client);
>
> @@ -1058,7 +1058,7 @@ MODULE_DEVICE_TABLE(i2c, pm2xxx_id);
>
> static struct i2c_driver pm2xxx_charger_driver = {
> .probe = pm2xxx_wall_charger_probe,
> - .remove = __devexit_p(pm2xxx_wall_charger_remove),
> + .remove = pm2xxx_wall_charger_remove,
> .suspend = pm2xxx_wall_charger_suspend,
> .resume = pm2xxx_wall_charger_resume,
> .driver = {
> --
> 1.8.0
>
>
next prev parent reply other threads:[~2013-03-25 3:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-10 13:34 [PATCH 1/5] power: ds2782_battery: Use dev_pm_ops Lars-Peter Clausen
2013-03-10 13:34 ` [PATCH 2/5] power: max17040_battery: " Lars-Peter Clausen
2013-03-12 5:59 ` Minkyu Kang
2013-04-01 6:00 ` Anton Vorontsov
2013-03-10 13:34 ` [PATCH 3/5] power: sbs-battery: " Lars-Peter Clausen
2013-03-11 18:05 ` Rhyland Klein
2013-03-10 13:34 ` [PATCH 4/5] power: pm2301_charger: Remove __dev* annotations Lars-Peter Clausen
2013-03-25 3:09 ` Anton Vorontsov [this message]
2013-03-10 13:34 ` [PATCH 5/5] power: pm2301_charger: Remove no-op suspend/resume callbacks Lars-Peter Clausen
2013-04-01 6:00 ` [PATCH 1/5] power: ds2782_battery: Use dev_pm_ops Anton Vorontsov
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=20130325030956.GA16489@lizard \
--to=anton@enomsg.org \
--cc=arnd@arndb.de \
--cc=dwmw2@infradead.org \
--cc=lars@metafoo.de \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).