From: Adrian Bunk <bunk@fs.tum.de>
To: Arnaldo Carvalho de Melo <acme@conectiva.com.br>,
Andrew Morton <akpm@osdl.org>,
linux-kernel@vger.kernel.org, campbell@torque.net,
linux-scsi@vger.kernel.org
Subject: [new patch] Re: 2.6.0-test4-mm5: SCSI imm driver doesn't compile
Date: Thu, 4 Sep 2003 19:50:20 +0200 [thread overview]
Message-ID: <20030904175019.GB1374@fs.tum.de> (raw)
In-Reply-To: <20030904133056.GA2411@conectiva.com.br>
On Thu, Sep 04, 2003 at 10:30:56AM -0300, Arnaldo Carvalho de Melo wrote:
>...
> I just converted it to the more safe c99 init style, but haven't noticed
> the original bug, that is "EPP 16 bit" was duplicated... But this is already
> fixed by Andrew Morton on current Linus bk tree.
>
> Thanks Andrew for fixing, Adrian for noticing.
Andrews patch removed the first IMM_EPP_16 line in the array.
This isn't correct especially in the !CONFIG_SCSI_IZIP_EPP16 case,
reading all uses of this array (IMM_MODE_STRING is used to print the
corresponding string in printks).
If I'm not misunderstanding it, CONFIG_SCSI_IZIP_EPP16 means "use 16bit
even when 32bit is requested".
It seems the right solution is
static char *IMM_MODE_STRING[] =
{
[IMM_AUTODETECT] = "Autodetect",
[IMM_NIBBLE] = "SPP",
[IMM_PS2] = "PS/2",
[IMM_EPP_8] = "EPP 8 bit",
[IMM_EPP_16] = "EPP 16 bit",
#ifdef CONFIG_SCSI_IZIP_EPP16
[IMM_EPP_32] = "EPP 16 bit",
#else
[IMM_EPP_32] = "EPP 32 bit",
#endif
[IMM_UNKNOWN] = "Unknown",
};
A patch against the current BK tree is below.
> - Arnaldo
cu
Adrian
--- linux-2.6.0-test4/drivers/scsi/imm.h.old 2003-09-04 19:47:23.000000000 +0200
+++ linux-2.6.0-test4/drivers/scsi/imm.h 2003-09-04 19:48:05.000000000 +0200
@@ -100,8 +100,9 @@
[IMM_NIBBLE] = "SPP",
[IMM_PS2] = "PS/2",
[IMM_EPP_8] = "EPP 8 bit",
-#ifdef CONFIG_SCSI_IZIP_EPP16
[IMM_EPP_16] = "EPP 16 bit",
+#ifdef CONFIG_SCSI_IZIP_EPP16
+ [IMM_EPP_32] = "EPP 16 bit",
#else
[IMM_EPP_32] = "EPP 32 bit",
#endif
next prev parent reply other threads:[~2003-09-04 17:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20030902231812.03fae13f.akpm@osdl.org>
2003-09-03 17:02 ` 2.6.0-test4-mm5: SCSI imm driver doesn't compile Adrian Bunk
2003-09-04 13:30 ` Arnaldo Carvalho de Melo
2003-09-04 13:52 ` Jan-Benedict Glaw
2003-09-04 14:30 ` Christoph Hellwig
2003-09-04 14:54 ` Jan-Benedict Glaw
2003-09-04 17:50 ` Adrian Bunk [this message]
2003-09-04 22:19 ` 2.6-test4: mpspec.h:6:25: mach_mpspec.h: Missing file John Donnelly
2003-09-05 14:02 ` Matthew Wilcox
2003-09-05 17:12 ` 2.6-test4: " jd
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=20030904175019.GB1374@fs.tum.de \
--to=bunk@fs.tum.de \
--cc=acme@conectiva.com.br \
--cc=akpm@osdl.org \
--cc=campbell@torque.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
/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