From patchwork Thu Mar 21 21:51:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2317281 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 369C0DF264 for ; Thu, 21 Mar 2013 21:58:56 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UInS8-0006hD-Ps; Thu, 21 Mar 2013 21:55:17 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UInOB-0005Cd-W2 for linux-arm-kernel@lists.infradead.org; Thu, 21 Mar 2013 21:51:16 +0000 Received: from wuerfel.lan (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0M72xB-1UfZXS0S1d-00wSP3; Thu, 21 Mar 2013 22:51:07 +0100 From: Arnd Bergmann To: Linus Walleij Subject: [PATCH 6/9] power: pm2301_charger: remove __devinit annotations Date: Thu, 21 Mar 2013 22:51:11 +0100 Message-Id: <1363902674-6456-7-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1363902674-6456-1-git-send-email-arnd@arndb.de> References: <1363866553-15054-1-git-send-email-linus.walleij@stericsson.com> <1363902674-6456-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:DdUD0LFffpxqTgsl+kG1spCEqCFCpA7okpPUjixQdec /UqaDaoj4u0Nxfzq403jdPHoBqAxy9ZLy8tQp4Oh+FvB1gIlwk 7YvIVUEFZ9uJXam9hFYqt73UGx7ilo1BPERbKZMazrnmb+072u letZXlHMxEakk/SfXB2WjwE3BweLTa1TaADTHb+oytB1/3Ec3D zDGEGYwj/DzAfhmhxTrQYKJQjkWTR59sJxpRk3knTGpVz9tRsD kFaiyXlq2doN23q/rWCHYAbHyZ5lSRPidcjH7NNMB8/KpV08ml RJM2+dPCM7WAvFu58KsiAWgYHYQDOHhqz2aNCTZTT/QZJ1UvYx EY0CWvoglI7q30zxa3OIle+5tqqHO+R9/GOQTvDUu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130321_175112_279863_C384A7F1 X-CRM114-Status: UNSURE ( 8.52 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 Acked-by: Linus Walleij --- 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 = {