Commit 77f18a87 authored Oct 11, 2016 by Arnd Bergmann Committed by Martin K. Petersen Oct 17, 2016

scsi: NCR5380: no longer mark irq probing as __init

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: a8cfbcae ("scsi: g_NCR5380: Stop using scsi_module.c")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 7d2c0d64

drivers/scsi/NCR5380.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);

Admin message