mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Zachary Richey <zr.public@gmail.com>
To: isdn@linux-pingi.de, tj@kernel.org
Cc: linux-kernel@vger.kernel.org, Zachary Richey <zr.public@gmail.com>
Subject: [PATCH] Drivers: isdn: Fixed warnings and odd code.
Date: Sat, 10 Jul 2010 17:27:29 -0400	[thread overview]
Message-ID: <c40325e3d4cdc2f8c196b57c8581a0656828187c.1278796499.git.zr.public@gmail.com> (raw)

This patch fixes compile time warnings in drivers/isdn/sc/init.c, and
also cleans up what looked like redundant code in this file.
Signed-off-by: Zachary Richey <zr.public@gmail.com>
---
 drivers/isdn/sc/init.c |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c
index ca710ab..1255995 100644
--- a/drivers/isdn/sc/init.c
+++ b/drivers/isdn/sc/init.c
@@ -484,27 +484,18 @@ static int identify_board(unsigned long rambase, unsigned int iobase)
 	 */
 	outb(PRI_BASEPG_VAL, pgport);
 	msleep_interruptible(1000);
-	sig = readl(rambase + SIG_OFFSET);
+	sig = readl(&rambase + SIG_OFFSET);
 	pr_debug("Looking for a signature, got 0x%lx\n", sig);
-	if(sig == SIGNATURE)
+	if (sig == SIGNATURE)
 		return PRI_BOARD;
-
-	/*
-	 * Try to identify a PRI card
-	 */
-	outb(BRI_BASEPG_VAL, pgport);
-	msleep_interruptible(1000);
-	sig = readl(rambase + SIG_OFFSET);
-	pr_debug("Looking for a signature, got 0x%lx\n", sig);
-	if(sig == SIGNATURE)
+	if (sig == SIGNATURE)
 		return BRI_BOARD;
-
 	return -1;
 
 	/*
 	 * Try to spot a card
 	 */
-	sig = readl(rambase + SIG_OFFSET);
+	sig = readl(&rambase + SIG_OFFSET);
 	pr_debug("Looking for a signature, got 0x%lx\n", sig);
 	if(sig != SIGNATURE)
 		return -1;
-- 
1.7.0.4


             reply	other threads:[~2010-07-10 21:27 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-10 21:27 Zachary Richey [this message]
2010-07-10 21:33 ` David Miller
2010-07-10 21:41 ` Sam Ravnborg

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=c40325e3d4cdc2f8c196b57c8581a0656828187c.1278796499.git.zr.public@gmail.com \
    --to=zr.public@gmail.com \
    --cc=isdn@linux-pingi.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tj@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

all inboxes | Powered by JetHome®