diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-10-11 05:23:23 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-10-17 14:13:03 -0400 |
commit | 77f18a87186a87cab2a027335758a7244896084c (patch) | |
tree | 5ae8bc460df6fa3aeeac9f2f0d56e505b23562f9 /drivers | |
parent | 7d2c0d643244311d0ce04fde373cd371ad1f1cad (diff) |
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: a8cfbcaec0c1 ("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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/NCR5380.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index db2739079cbb..790babc5ef66 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c | |||
@@ -353,7 +353,7 @@ static void NCR5380_print_phase(struct Scsi_Host *instance) | |||
353 | #endif | 353 | #endif |
354 | 354 | ||
355 | 355 | ||
356 | static int probe_irq __initdata; | 356 | static int probe_irq; |
357 | 357 | ||
358 | /** | 358 | /** |
359 | * probe_intr - helper for IRQ autoprobe | 359 | * probe_intr - helper for IRQ autoprobe |
@@ -365,7 +365,7 @@ static int probe_irq __initdata; | |||
365 | * used by the IRQ probe code. | 365 | * used by the IRQ probe code. |
366 | */ | 366 | */ |
367 | 367 | ||
368 | static irqreturn_t __init probe_intr(int irq, void *dev_id) | 368 | static irqreturn_t probe_intr(int irq, void *dev_id) |
369 | { | 369 | { |
370 | probe_irq = irq; | 370 | probe_irq = irq; |
371 | return IRQ_HANDLED; | 371 | return IRQ_HANDLED; |
@@ -380,7 +380,7 @@ static irqreturn_t __init probe_intr(int irq, void *dev_id) | |||
380 | * and then looking to see what interrupt actually turned up. | 380 | * and then looking to see what interrupt actually turned up. |
381 | */ | 381 | */ |
382 | 382 | ||
383 | static int __init __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, | 383 | static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, |
384 | int possible) | 384 | int possible) |
385 | { | 385 | { |
386 | struct NCR5380_hostdata *hostdata = shost_priv(instance); | 386 | struct NCR5380_hostdata *hostdata = shost_priv(instance); |