diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-03-18 11:54:40 +0100 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-04-22 20:16:49 +0200 |
| commit | 7b54e43a8d1140153e317de5e0dc00d81c709d4d (patch) | |
| tree | 1f6d9c26c5d8e2a68b69d334ab3620d1442fc1f5 | |
| parent | net/ariadne: Improve debug prints (diff) | |
| download | linux-7b54e43a8d1140153e317de5e0dc00d81c709d4d.tar.xz linux-7b54e43a8d1140153e317de5e0dc00d81c709d4d.zip | |
scsi/atari: Revive "atascsi=" setup option
It was documented in Documentation/m68k/kernel-options.txt and
Documentation/scsi/scsi-parameters.txt, but the implementation was
missing.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitzmic@googlemail.com>
Cc: James E.J. Bottomley <JBottomley@parallels.com>
Cc: linux-scsi@vger.kernel.org
| -rw-r--r-- | drivers/scsi/atari_scsi.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c index 04a154f87e3e..3102ce524f61 100644 --- a/drivers/scsi/atari_scsi.c +++ b/drivers/scsi/atari_scsi.c @@ -734,17 +734,21 @@ int atari_scsi_release(struct Scsi_Host *sh) return 1; } -void __init atari_scsi_setup(char *str, int *ints) +#ifndef MODULE +static int __init atari_scsi_setup(char *str) { /* Format of atascsi parameter is: * atascsi=<can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags> * Defaults depend on TT or Falcon, hostid determined at run time. * Negative values mean don't change. */ + int ints[6]; + + get_options(str, ARRAY_SIZE(ints), ints); if (ints[0] < 1) { printk("atari_scsi_setup: no arguments!\n"); - return; + return 0; } if (ints[0] >= 1) { @@ -777,8 +781,13 @@ void __init atari_scsi_setup(char *str, int *ints) setup_use_tagged_queuing = !!ints[5]; } #endif + + return 1; } +__setup("atascsi=", atari_scsi_setup); +#endif /* !MODULE */ + int atari_scsi_bus_reset(Scsi_Cmnd *cmd) { int rv; |