summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <sven.wegener@stealer.net>2008-09-20 12:26:17 +0000
committerSven Wegener <sven.wegener@stealer.net>2009-02-08 23:35:00 +0000
commit3a4bf73cf1d438ffd6466135c7ad75323f1c5132 (patch)
treeca2764557a973e038f82e5fc15909312eb76a73a
parentff0a3d00b53d7ef877d0b0d0c9964acedb25214c (diff)
mISDN: sparse fixes
Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
-rw-r--r--drivers/isdn/hardware/mISDN/hfcmulti.c24
1 files changed, 3 insertions, 21 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 595ba8eb4a07..76ec6c7a9849 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -168,13 +168,13 @@
#define MAX_PORTS (8 * MAX_CARDS)
static LIST_HEAD(HFClist);
-static spinlock_t HFClock; /* global hfc list lock */
+static DEFINE_SPINLOCK(HFClock); /* global hfc list lock */
static void ph_state_change(struct dchannel *);
static struct hfc_multi *syncmaster;
static int plxsd_master; /* if we have a master card (yet) */
-static spinlock_t plx_lock; /* may not acquire other lock inside */
+static DEFINE_SPINLOCK(plx_lock); /* may not acquire other lock inside */
#define TYP_E1 1
#define TYP_4S 4
@@ -792,20 +792,6 @@ vpm_init(struct hfc_multi *wc)
}
}
-#ifdef UNUSED
-static void
-vpm_check(struct hfc_multi *hctmp)
-{
- unsigned char gpi2;
-
- gpi2 = HFC_inb(hctmp, R_GPI_IN2);
-
- if ((gpi2 & 0x3) != 0x3)
- printk(KERN_DEBUG "Got interrupt 0x%x from VPM!\n", gpi2);
-}
-#endif /* UNUSED */
-
-
/*
* Interface to enable/disable the HW Echocan
*
@@ -893,8 +879,7 @@ static inline void
hfcmulti_resync(struct hfc_multi *locked, struct hfc_multi *newmaster, int rm)
{
struct hfc_multi *hc, *next, *pcmmaster = NULL;
- void __iomem *plx_acc_32;
- u_int pv;
+ u_int *plx_acc_32, pv;
u_long flags;
spin_lock_irqsave(&HFClock, flags);
@@ -5266,9 +5251,6 @@ HFCmulti_init(void)
printk(KERN_DEBUG "%s: IRQ_DEBUG IS ENABLED!\n", __func__);
#endif
- spin_lock_init(&HFClock);
- spin_lock_init(&plx_lock);
-
if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_DEBUG "%s: init entered\n", __func__);