From: Geert Uytterhoeven <geert@linux-m68k.org>
To: linux-m68k@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>,
Michael Schmitz <schmitzmic@googlemail.com>,
"James E.J. Bottomley" <JBottomley@parallels.com>,
linux-scsi@vger.kernel.org
Subject: [PATCH 10/11] scsi/atari: Revive "atascsi=" setup option
Date: Wed, 21 Mar 2012 10:51:54 +0100 [thread overview]
Message-ID: <1332323515-7314-10-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1332323515-7314-1-git-send-email-geert@linux-m68k.org>
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
---
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 04a154f..3102ce5 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;
--
1.7.0.4
next prev parent reply other threads:[~2012-03-21 9:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-21 9:51 [PATCH 01/11] m68k: Remove unused MAX_NOINT_IPL definition Geert Uytterhoeven
2012-03-21 9:51 ` [PATCH 02/11] m68k/amiga: Mark z_dev_present() __init Geert Uytterhoeven
2012-03-21 9:51 ` [PATCH 03/11] m68k/amiga: Add error checks when registering platform devices Geert Uytterhoeven
2012-03-21 9:51 ` [PATCH 04/11] m68k/amiga: Use arch_initcall() for " Geert Uytterhoeven
2012-03-21 9:51 ` [PATCH 05/11] m68k/atari: Add missing platform check before " Geert Uytterhoeven
2012-03-25 3:46 ` Michael Schmitz
2012-03-25 8:01 ` Geert Uytterhoeven
2012-03-25 18:53 ` Michael Schmitz
2012-03-21 9:51 ` [PATCH 06/11] m68k/atari: Change VME irq numbers from unsigned long to unsigned int Geert Uytterhoeven
2012-03-21 9:51 ` [PATCH 07/11] m68k/mac: Add missing platform check before registering platform devices Geert Uytterhoeven
2012-03-21 9:51 ` [PATCH 08/11] input/amijoy: Add missing platform check Geert Uytterhoeven
2012-03-26 6:29 ` Dmitry Torokhov
2012-03-21 9:51 ` [PATCH 09/11] net/ariadne: Improve debug prints Geert Uytterhoeven
2012-03-22 2:16 ` David Miller
2012-03-21 9:51 ` Geert Uytterhoeven [this message]
2012-03-21 9:51 ` [PATCH 11/11] scsi/atari: Make more functions static Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332323515-7314-10-git-send-email-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=JBottomley@parallels.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=schmitzmic@googlemail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).