From: Geert Uytterhoeven <geert@linux-m68k.org>
To: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: linux-scsi@vger.kernel.org, linux-m68k@vger.kernel.org,
linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>,
Sam Creasey <sammy@sammy.net>
Subject: [PATCH 6/8] scsi/sun3: Check for NCR_TIMEOUT being defined instead of having a value
Date: Mon, 13 Jun 2011 20:39:20 +0200 [thread overview]
Message-ID: <1307990362-22768-7-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1307990362-22768-1-git-send-email-geert@linux-m68k.org>
This fixes:
drivers/scsi/sun3_NCR5380.c:1448:5: warning: "NCR_TIMEOUT" is not defined
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Sam Creasey <sammy@sammy.net>
---
drivers/scsi/sun3_NCR5380.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index 2ba1cb7..f3cffdf 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -1445,7 +1445,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd,
local_irq_restore(flags);
/* Wait for arbitration logic to complete */
-#if NCR_TIMEOUT
+#ifdef NCR_TIMEOUT
{
unsigned long timeout = jiffies + 2*NCR_TIMEOUT;
--
1.7.0.4
next prev parent reply other threads:[~2011-06-13 18:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-13 18:39 M68k SCSI compile warning fixes Geert Uytterhoeven
2011-06-13 18:39 ` [PATCH 1/8] scsi/atari: Provide a dummy NCR5380_exit() Geert Uytterhoeven
2011-06-13 18:39 ` [PATCH 2/8] scsi/mac: macscsi_detect() should be __init Geert Uytterhoeven
2011-06-13 18:39 ` [PATCH 3/8] scsi/mac: Remove unused variable default_instance Geert Uytterhoeven
2011-06-13 18:39 ` [PATCH 4/8] scsi/sun3: sun3scsi_detect() and NCR5380_init() should be __init Geert Uytterhoeven
2011-06-13 18:39 ` [PATCH 5/8] scsi/sun3: Provide a dummy NCR5380_exit() Geert Uytterhoeven
2011-06-13 18:39 ` Geert Uytterhoeven [this message]
2011-06-13 18:39 ` [PATCH 7/8] scsi/sun3: Add various missing NDEBUG* definitions Geert Uytterhoeven
2011-06-13 18:39 ` [PATCH 8/8] scsi/sun3: Remove commented out merge_contiguous_buffers Geert Uytterhoeven
2011-06-13 18:41 ` [PATCH 0/8] M68k SCSI compile warning fixes 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=1307990362-22768-7-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=sammy@sammy.net \
/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