diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-03-18 06:54:40 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-04-22 14:16:49 -0400 |
commit | 7b54e43a8d1140153e317de5e0dc00d81c709d4d (patch) | |
tree | 1f6d9c26c5d8e2a68b69d334ab3620d1442fc1f5 /drivers/scsi/atari_scsi.c | |
parent | 0eb8694b180c4cf017d1a0bd70a41bd58389375d (diff) |
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
Diffstat (limited to 'drivers/scsi/atari_scsi.c')
-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) | |||
734 | return 1; | 734 | return 1; |
735 | } | 735 | } |
736 | 736 | ||
737 | void __init atari_scsi_setup(char *str, int *ints) | 737 | #ifndef MODULE |
738 | static int __init atari_scsi_setup(char *str) | ||
738 | { | 739 | { |
739 | /* Format of atascsi parameter is: | 740 | /* Format of atascsi parameter is: |
740 | * atascsi=<can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags> | 741 | * atascsi=<can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags> |
741 | * Defaults depend on TT or Falcon, hostid determined at run time. | 742 | * Defaults depend on TT or Falcon, hostid determined at run time. |
742 | * Negative values mean don't change. | 743 | * Negative values mean don't change. |
743 | */ | 744 | */ |
745 | int ints[6]; | ||
746 | |||
747 | get_options(str, ARRAY_SIZE(ints), ints); | ||
744 | 748 | ||
745 | if (ints[0] < 1) { | 749 | if (ints[0] < 1) { |
746 | printk("atari_scsi_setup: no arguments!\n"); | 750 | printk("atari_scsi_setup: no arguments!\n"); |
747 | return; | 751 | return 0; |
748 | } | 752 | } |
749 | 753 | ||
750 | if (ints[0] >= 1) { | 754 | if (ints[0] >= 1) { |
@@ -777,8 +781,13 @@ void __init atari_scsi_setup(char *str, int *ints) | |||
777 | setup_use_tagged_queuing = !!ints[5]; | 781 | setup_use_tagged_queuing = !!ints[5]; |
778 | } | 782 | } |
779 | #endif | 783 | #endif |
784 | |||
785 | return 1; | ||
780 | } | 786 | } |
781 | 787 | ||
788 | __setup("atascsi=", atari_scsi_setup); | ||
789 | #endif /* !MODULE */ | ||
790 | |||
782 | int atari_scsi_bus_reset(Scsi_Cmnd *cmd) | 791 | int atari_scsi_bus_reset(Scsi_Cmnd *cmd) |
783 | { | 792 | { |
784 | int rv; | 793 | int rv; |