From patchwork Fri Jan 25 18:53:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2046991 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id BE86B3FDC4 for ; Fri, 25 Jan 2013 18:57:15 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TyoPi-0002f1-DR; Fri, 25 Jan 2013 18:54:10 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TyoPe-0002el-Au for linux-arm-kernel@lists.infradead.org; Fri, 25 Jan 2013 18:54:07 +0000 Received: from wuerfel.lan (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MCMWT-1U7vEM2MSH-00934U; Fri, 25 Jan 2013 19:53:59 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] mfd/vexpress: vexpress_sysreg_setup must not be __init Date: Fri, 25 Jan 2013 18:53:52 +0000 Message-Id: <1359140032-6039-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.0 X-Provags-ID: V02:K0:/Dg57t72dmKAmkOl0eNGzg/OP1dkf++469ukXfGXlU/ XKzCNyflVd2ktRmyYixbzUp8ftI2aAGWUMwMF103d1huSVgiNg 3ehgRSan7S6SiX8Xtz3oWvHq6sggs3LDJIBYs0YkXECQYCamSN DfOaJF/rLGDpiP1nXDHH/cYVA3ukULn05VY4O26D4REJkwZM7h /zp69XswH3U0Xy8vqvxahwGFcT0b8+sEqZ48BBwNmFjtaA/dvz W1MhSY12tzOSIvfkvvtarZ4d6wnv/gGP9PMhZC6bSW2oRHZAc4 S45Fi0rmKXpI5iGAAt9FVQhTy2fDwyoR8nkRvZJjHubaTRbYwc TTPpeGZjpEycJ/yHdNRLvTfTngKc8wfHQRkV6lClp X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130125_135406_604875_61E7DAFD X-CRM114-Status: UNSURE ( 8.22 ) 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.17.10 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: arm@kernel.org, Pawel Moll , Arnd Bergmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The patch 52666298a 'mfd: vexpress-sysreg: Don't skip initialization on probe' adds a call to vexpress_sysreg_setup from a non-__init function, so this also has to lose its __init annotation. Signed-off-by: Arnd Bergmann Cc: Pawel Moll Cc: arm@kernel.org Acked-by: Pawel Moll --- drivers/mfd/vexpress-sysreg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c index 77048b1..558c292 100644 --- a/drivers/mfd/vexpress-sysreg.c +++ b/drivers/mfd/vexpress-sysreg.c @@ -313,7 +313,7 @@ static void vexpress_sysreg_config_complete(unsigned long data) } -void __init vexpress_sysreg_setup(struct device_node *node) +void vexpress_sysreg_setup(struct device_node *node) { if (WARN_ON(!vexpress_sysreg_base)) return;