[PATCH] Drivers: isdn: Fixed warnings and odd code.
in [Kernel]
|
Prev: [PATCH -staging] slicoss: README update
Next: [PATCH] Fix warning: statement with no effect due to vt_kern.h
From: Zachary Richey on 10 Jul 2010 17:30 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(a)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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |