diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2014-11-12 16:11:49 +1100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-11-20 09:11:03 +0100 |
| commit | 925e4610933ed8ad047015188186b6d98105b980 (patch) | |
| tree | 7303683c98b06b52b8230b726b414efcc531de74 | |
| parent | acfc8cad9135444fdad5385cd9f795fab469a699 (diff) | |
| download | op-kernel-dev-925e4610933ed8ad047015188186b6d98105b980.zip op-kernel-dev-925e4610933ed8ad047015188186b6d98105b980.tar.gz | |
ncr5380: Fix compiler warnings and __setup options
Some __setup() options mentioned in Documentation/scsi don't work because
a few lines of code went missing sometime since Linux 2.4. Fix the options
and thus fix some compiler warnings for both the non-modular case,
CC drivers/scsi/dtc.o
drivers/scsi/dtc.c:176:20: warning: 'dtc_setup' defined but not used [-Wunused-function]
and the modular case,
CC [M] drivers/scsi/pas16.o
drivers/scsi/pas16.c:335:20: warning: 'pas16_setup' defined but not used [-Wunused-function]
CC [M] drivers/scsi/t128.o
drivers/scsi/t128.c:147:20: warning: 't128_setup' defined but not used [-Wunused-function]
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | drivers/scsi/dtc.c | 8 | ||||
| -rw-r--r-- | drivers/scsi/pas16.c | 10 | ||||
| -rw-r--r-- | drivers/scsi/t128.c | 11 |
3 files changed, 26 insertions, 3 deletions
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c index 0a667fe..f271fc5 100644 --- a/drivers/scsi/dtc.c +++ b/drivers/scsi/dtc.c @@ -173,10 +173,13 @@ static const struct signature { * */ -static void __init dtc_setup(char *str, int *ints) +static int __init dtc_setup(char *str) { static int commandline_current = 0; int i; + int ints[10]; + + get_options(str, ARRAY_SIZE(ints), ints); if (ints[0] != 2) printk("dtc_setup: usage dtc=address,irq\n"); else if (commandline_current < NO_OVERRIDES) { @@ -189,7 +192,10 @@ static void __init dtc_setup(char *str, int *ints) } ++commandline_current; } + return 1; } + +__setup("dtc=", dtc_setup); #endif /* diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c index 80bacb5..f4a1014 100644 --- a/drivers/scsi/pas16.c +++ b/drivers/scsi/pas16.c @@ -337,6 +337,7 @@ static int __init } +#ifndef MODULE /* * Function : pas16_setup(char *str, int *ints) * @@ -347,10 +348,13 @@ static int __init * */ -void __init pas16_setup(char *str, int *ints) +static int __init pas16_setup(char *str) { static int commandline_current = 0; int i; + int ints[10]; + + get_options(str, ARRAY_SIZE(ints), ints); if (ints[0] != 2) printk("pas16_setup : usage pas16=io_port,irq\n"); else @@ -364,8 +368,12 @@ void __init pas16_setup(char *str, int *ints) } ++commandline_current; } + return 1; } +__setup("pas16=", pas16_setup); +#endif + /* * Function : int pas16_detect(struct scsi_host_template * tpnt) * diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c index 8cc8093..09556eb 100644 --- a/drivers/scsi/t128.c +++ b/drivers/scsi/t128.c @@ -148,6 +148,7 @@ static struct signature { #define NO_SIGNATURES ARRAY_SIZE(signatures) +#ifndef MODULE /* * Function : t128_setup(char *str, int *ints) * @@ -158,9 +159,13 @@ static struct signature { * */ -void __init t128_setup(char *str, int *ints){ +static int __init t128_setup(char *str) +{ static int commandline_current = 0; int i; + int ints[10]; + + get_options(str, ARRAY_SIZE(ints), ints); if (ints[0] != 2) printk("t128_setup : usage t128=address,irq\n"); else @@ -174,8 +179,12 @@ void __init t128_setup(char *str, int *ints){ } ++commandline_current; } + return 1; } +__setup("t128=", t128_setup); +#endif + /* * Function : int t128_detect(struct scsi_host_template * tpnt) * |
