From patchwork Tue Oct 11 09:23:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101705 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp267345qge; Tue, 11 Oct 2016 02:25:38 -0700 (PDT) X-Received: by 10.107.58.86 with SMTP id h83mr4964783ioa.117.1476177938355; Tue, 11 Oct 2016 02:25:38 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d16si3124288pfl.155.2016.10.11.02.25.37; Tue, 11 Oct 2016 02:25:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752883AbcJKJZ2 (ORCPT + 27 others); Tue, 11 Oct 2016 05:25:28 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:53291 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752516AbcJKJZP (ORCPT ); Tue, 11 Oct 2016 05:25:15 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0M8u6u-1bhkCa1Nim-00CBmy; Tue, 11 Oct 2016 11:24:00 +0200 From: Arnd Bergmann To: "James E.J. Bottomley" , "Martin K. Petersen" Cc: Ondrej Zary , Finn Thain , Arnd Bergmann , Michael Schmitz , Hannes Reinecke , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] scsi: NCR5380: no longer mark irq probing as __init Date: Tue, 11 Oct 2016 11:23:23 +0200 Message-Id: <20161011092356.2872181-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:Y91J3fvixWjAjydcQ2PvNlClulKxcETCfeXRPJSu81/vlEvAhqn mrdRiQcww59lP4MGuJ4jLH5QWpZkfJwzhxLn3xbkTEllL9b0c7qU947NoDiXlo+CTbF4w5C v2ESAeugksALkLS59umht7FTt1H1OcRdFRVOvnerxP5iBTcyLIxxUTZ6cXKe0i+SQ/P5tp6 STbH1tcGMABOMMcrpCN8A== X-UI-Out-Filterresults: notjunk:1; V01:K0:6BhDrbJltIM=:jWGLCY4L1opWQPv/+PlDVv jSQM03/p56b4Tqqdy8oXIfW0vCRQaeHjkKckoY/DEWL5sJPkyGkWqRvP1pUJ8lJsdeocX/MtS DQSN0/TKzjpBHoe7c26wLliUfQS14PTxUHADZOnCJCLd5bmLVq3Bh2xqBxTb7Xvb/fjkI74Tc TC5wduvMpHkB4DP4XOKVL6XBw6QCyzXgbOJ5Oa3GUDVvYQ8JPR1isBiotdJmChO4BVOZIXAtD 0SmDmNtenCFmQEru6zIM0diKEXlSIlUQ5VZ4hhFdDN8fHTQ9T7SEc79dL2pkgKG2unPzmKcFY KdEQRCLlMK6HQ8f1dUJ4XAJDX6NXaEIyMYuwP4PJ+XlcWXfWORX+R+piTmMl7AeFkuZ/CtRUg TXJivvI3aqkIHYtd7oRR3Z7XouuKsj/7TsLG0bl+OFpWA+Ec+0rbFe1+oxVZP6pCLX7utvVg3 ZLaX0/OKg7LJkmOQayTxI6wfwTJfSwi3WWW2wCxEYTO0SHVNDWG3CNq4zVbNM7PeBkrlrVO+v 490/M/MvcgVxU/YIHdVp7kJE+bM2u8WoPQxQ3Op9P0IfT8glghkXjm7nXy2wBXFNZ9taG6iZg DDxtWct4SnHT7EoNH40RIJN6SEFaYrB1kxtjZRk2r38am3JbXptbS1tQ1jrTZObJICYxrqjoq ygLMD5jL0ha3YkhfJgKUUTGwLLglWVsCYcxNqZCaMJ1Y1zbKGo6ffBKwEYh25cXCsGR8= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The g_NCR5380 has been converted to more regular probing, which means its probe function can now be invoked after the __init section is discarded, as pointed out by this kbuild warning: WARNING: drivers/scsi/built-in.o(.text+0x3a105): Section mismatch in reference from the function generic_NCR5380_isa_match() to the function .init.text:probe_intr() WARNING: drivers/scsi/built-in.o(.text+0x3a145): Section mismatch in reference from the function generic_NCR5380_isa_match() to the variable .init.data:probe_irq To make sure this works correctly in all cases, let's remove the __init and __initdata annotations. Fixes: a8cfbcaec0c1 ("scsi: g_NCR5380: Stop using scsi_module.c") Signed-off-by: Arnd Bergmann --- drivers/scsi/NCR5380.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 7053de5bd468..61f34aca2fa0 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c @@ -353,7 +353,7 @@ static void NCR5380_print_phase(struct Scsi_Host *instance) #endif -static int probe_irq __initdata; +static int probe_irq; /** * probe_intr - helper for IRQ autoprobe @@ -365,7 +365,7 @@ static int probe_irq __initdata; * used by the IRQ probe code. */ -static irqreturn_t __init probe_intr(int irq, void *dev_id) +static irqreturn_t probe_intr(int irq, void *dev_id) { probe_irq = irq; return IRQ_HANDLED; @@ -380,7 +380,7 @@ static irqreturn_t __init probe_intr(int irq, void *dev_id) * and then looking to see what interrupt actually turned up. */ -static int __init __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, +static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, int possible) { struct NCR5380_hostdata *hostdata = shost_priv(instance);