aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/atari_scsi.c13
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
737void __init atari_scsi_setup(char *str, int *ints) 737#ifndef MODULE
738static 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
782int atari_scsi_bus_reset(Scsi_Cmnd *cmd) 791int atari_scsi_bus_reset(Scsi_Cmnd *cmd)
783{ 792{
784 int rv; 793 int rv;