aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/t128.c
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2014-11-12 00:11:49 -0500
committerChristoph Hellwig <hch@lst.de>2014-11-20 03:11:03 -0500
commit925e4610933ed8ad047015188186b6d98105b980 (patch)
tree7303683c98b06b52b8230b726b414efcc531de74 /drivers/scsi/t128.c
parentacfc8cad9135444fdad5385cd9f795fab469a699 (diff)
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>
Diffstat (limited to 'drivers/scsi/t128.c')
-rw-r--r--drivers/scsi/t128.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c
index 8cc80931df14..09556ebe1da1 100644
--- a/drivers/scsi/t128.c
+++ b/drivers/scsi/t128.c
@@ -148,6 +148,7 @@ static struct signature {
148 148
149#define NO_SIGNATURES ARRAY_SIZE(signatures) 149#define NO_SIGNATURES ARRAY_SIZE(signatures)
150 150
151#ifndef MODULE
151/* 152/*
152 * Function : t128_setup(char *str, int *ints) 153 * Function : t128_setup(char *str, int *ints)
153 * 154 *
@@ -158,9 +159,13 @@ static struct signature {
158 * 159 *
159 */ 160 */
160 161
161void __init t128_setup(char *str, int *ints){ 162static int __init t128_setup(char *str)
163{
162 static int commandline_current = 0; 164 static int commandline_current = 0;
163 int i; 165 int i;
166 int ints[10];
167
168 get_options(str, ARRAY_SIZE(ints), ints);
164 if (ints[0] != 2) 169 if (ints[0] != 2)
165 printk("t128_setup : usage t128=address,irq\n"); 170 printk("t128_setup : usage t128=address,irq\n");
166 else 171 else
@@ -174,8 +179,12 @@ void __init t128_setup(char *str, int *ints){
174 } 179 }
175 ++commandline_current; 180 ++commandline_current;
176 } 181 }
182 return 1;
177} 183}
178 184
185__setup("t128=", t128_setup);
186#endif
187
179/* 188/*
180 * Function : int t128_detect(struct scsi_host_template * tpnt) 189 * Function : int t128_detect(struct scsi_host_template * tpnt)
181 * 190 *