All of lore.kernel.org
 help / color / mirror / Atom feed
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/9] power: pm2301_charger: remove __devinit annotations
Date: Thu, 21 Mar 2013 22:51:11 +0100	[thread overview]
Message-ID: <1363902674-6456-7-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1363902674-6456-1-git-send-email-arnd@arndb.de>

These got missed in the treewide changes because they came in through
a new branch, and it now breaks allmodconfig builds.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 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.1.2

  parent reply	other threads:[~2013-03-21 21:51 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-21 11:49 [PATCH 0/6] ARM: ux500: first multiplatform series Linus Walleij
2013-03-21 11:49 ` [PATCH 1/6] ARM: ux500: move debugmacro to debug includes Linus Walleij
2013-03-21 12:06   ` Arnd Bergmann
2013-03-21 11:49 ` [PATCH 2/6] clk: ux500: pass clock base adresses in init call Linus Walleij
2013-03-21 12:10   ` Arnd Bergmann
2013-03-21 14:05   ` Ulf Hansson
2013-03-21 17:50   ` Mike Turquette
2013-03-21 11:49 ` [PATCH 3/6] mfd: prcmu: pass a base and size with the early initcall Linus Walleij
2013-03-21 12:11   ` Arnd Bergmann
2013-03-21 14:01     ` Ulf Hansson
2013-03-21 11:49 ` [PATCH 4/6] mfd: db8500-prcmu: get base address from resource Linus Walleij
2013-03-21 12:15   ` Arnd Bergmann
2013-03-21 17:10     ` Linus Walleij
2013-03-21 19:07       ` Arnd Bergmann
2013-03-21 20:26         ` Loic PALLARDY
2013-03-21 11:49 ` [PATCH 5/6] ARM: ux500: move PRCMU functions into the CPUidle driver Linus Walleij
2013-03-21 12:14   ` Rickard Andersson
2013-03-21 12:30     ` Daniel Lezcano
2013-03-22  8:30       ` Rickard Andersson
2013-03-25 13:44       ` Linus Walleij
2013-03-25 13:58         ` Daniel Lezcano
2013-03-25 14:10           ` Linus Walleij
2013-03-25 14:11             ` Arnd Bergmann
2013-03-25 14:36               ` Linus Walleij
2013-03-25 15:13                 ` Arnd Bergmann
2013-03-25 15:48                   ` Linus Walleij
2013-03-21 11:49 ` [PATCH 6/6] ARM: ux500: get rid of <mach/[hardware|db8500-regs].h> Linus Walleij
2013-03-21 12:21   ` Arnd Bergmann
2013-03-21 21:51 ` [PATCH 0/9] More ux500 multiplatform stuff Arnd Bergmann
2013-03-21 21:51   ` [PATCH 1/9] ARM: ux500: move mach/msp.h to include/linux/platform_data.h Arnd Bergmann
2013-03-21 21:51   ` [PATCH 2/9] ARM: ux500: split out prcmu initialization Arnd Bergmann
2013-03-21 21:51   ` [PATCH 3/9] ARM: ux500: make irqs.h local to platform Arnd Bergmann
2013-03-21 21:51   ` [PATCH 4/9] ARM: ux500: kill mach/hardware.h some more Arnd Bergmann
2013-03-21 21:51   ` [PATCH 5/9] staging: ste_rmi4: kill platform_data hack Arnd Bergmann
2013-03-25 13:12     ` Linus Walleij
2013-03-25 18:00       ` Greg KH
2013-03-21 21:51   ` Arnd Bergmann [this message]
2013-03-22 12:14     ` [PATCH 6/9] power: pm2301_charger: remove __devinit annotations Linus Walleij
2013-03-22 15:16       ` Anton Vorontsov
2013-03-25  3:09       ` Anton Vorontsov
2013-03-21 21:51   ` [PATCH 7/9] ARM: ux500: make remaining headers local Arnd Bergmann
2013-03-21 21:51   ` [PATCH 8/9] ARM: ux500: move to multiplatform Arnd Bergmann
2013-03-21 21:51   ` [PATCH 9/9] ARM: ux500: build hotplug.o for ARMv7-a Arnd Bergmann
2013-03-22 13:21   ` [PATCH 0/9] More ux500 multiplatform stuff Linus Walleij
2013-03-22 13:34     ` Arnd Bergmann
2013-03-22 13:36       ` Linus Walleij
2013-03-22 14:16         ` Arnd Bergmann
2013-03-22 14:39       ` Linus Walleij
2013-03-22 15:25         ` Arnd Bergmann

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=1363902674-6456-7-git-send-email-arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.