AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-25 10:50:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

mISDN: Cleanup debug messages

Browse Source 
This patch make debug printk's KERN_DEBUG and also fix some
codestyle issues.

Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Karsten Keil 2009-05-22 11:04:56 +00:00 committed by David S. Miller
parent 7245a2fe3c
commit eac74af9b5
12 changed files with 148 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
drivers/isdn/hardware/mISDN/hfcmulti.c
View File

@ -275,7 +275,7 @@ HFC_outb_pcimem(struct hfc_multi *hc, u_char reg, u_char val,
HFC_outb_pcimem(struct hfc_multi *hc, u_char reg, u_char val) HFC_outb_pcimem(struct hfc_multi *hc, u_char reg, u_char val)
#endif #endif
{ {
writeb(val, (hc->pci_membase)+reg); writeb(val, hc->pci_membase + reg);
} }
static u_char static u_char
#ifdef HFC_REGISTER_DEBUG #ifdef HFC_REGISTER_DEBUG
@ -284,7 +284,7 @@ HFC_inb_pcimem(struct hfc_multi *hc, u_char reg, const char *function, int line)
HFC_inb_pcimem(struct hfc_multi *hc, u_char reg) HFC_inb_pcimem(struct hfc_multi *hc, u_char reg)
#endif #endif
{ {
return readb((hc->pci_membase)+reg); return readb(hc->pci_membase + reg);
} }
static u_short static u_short
#ifdef HFC_REGISTER_DEBUG #ifdef HFC_REGISTER_DEBUG
@ -293,7 +293,7 @@ HFC_inw_pcimem(struct hfc_multi *hc, u_char reg, const char *function, int line)
HFC_inw_pcimem(struct hfc_multi *hc, u_char reg) HFC_inw_pcimem(struct hfc_multi *hc, u_char reg)
#endif #endif
{ {
return readw((hc->pci_membase)+reg); return readw(hc->pci_membase + reg);
} }
static void static void
#ifdef HFC_REGISTER_DEBUG #ifdef HFC_REGISTER_DEBUG
@ -302,7 +302,8 @@ HFC_wait_pcimem(struct hfc_multi *hc, const char *function, int line)
HFC_wait_pcimem(struct hfc_multi *hc) HFC_wait_pcimem(struct hfc_multi *hc)
#endif #endif
{ {
while (readb((hc->pci_membase)+R_STATUS) & V_BUSY); while (readb(hc->pci_membase + R_STATUS) & V_BUSY)
cpu_relax();
} }
/* HFC_IO_MODE_REGIO */ /* HFC_IO_MODE_REGIO */
@ -314,7 +315,7 @@ HFC_outb_regio(struct hfc_multi *hc, u_char reg, u_char val,
HFC_outb_regio(struct hfc_multi *hc, u_char reg, u_char val) HFC_outb_regio(struct hfc_multi *hc, u_char reg, u_char val)
#endif #endif
{ {
outb(reg, (hc->pci_iobase)+4); outb(reg, hc->pci_iobase + 4);
outb(val, hc->pci_iobase); outb(val, hc->pci_iobase);
} }
static u_char static u_char
@ -324,7 +325,7 @@ HFC_inb_regio(struct hfc_multi *hc, u_char reg, const char *function, int line)
HFC_inb_regio(struct hfc_multi *hc, u_char reg) HFC_inb_regio(struct hfc_multi *hc, u_char reg)
#endif #endif
{ {
outb(reg, (hc->pci_iobase)+4); outb(reg, hc->pci_iobase + 4);
return inb(hc->pci_iobase); return inb(hc->pci_iobase);
} }
static u_short static u_short
@ -334,7 +335,7 @@ HFC_inw_regio(struct hfc_multi *hc, u_char reg, const char *function, int line)
HFC_inw_regio(struct hfc_multi *hc, u_char reg) HFC_inw_regio(struct hfc_multi *hc, u_char reg)
#endif #endif
{ {
outb(reg, (hc->pci_iobase)+4); outb(reg, hc->pci_iobase + 4);
return inw(hc->pci_iobase); return inw(hc->pci_iobase);
} }
static void static void
@ -344,8 +345,9 @@ HFC_wait_regio(struct hfc_multi *hc, const char *function, int line)
HFC_wait_regio(struct hfc_multi *hc) HFC_wait_regio(struct hfc_multi *hc)
#endif #endif
{ {
outb(R_STATUS, (hc->pci_iobase)+4); outb(R_STATUS, hc->pci_iobase + 4);
while (inb(hc->pci_iobase) & V_BUSY); while (inb(hc->pci_iobase) & V_BUSY)
cpu_relax();
} }
#ifdef HFC_REGISTER_DEBUG #ifdef HFC_REGISTER_DEBUG
@ -481,6 +483,7 @@ write_fifo_pcimem(struct hfc_multi *hc, u_char *data, int len)
len--; len--;
} }
} }
/* read fifo data (REGIO) */ /* read fifo data (REGIO) */
static void static void
read_fifo_regio(struct hfc_multi *hc, u_char *data, int len) read_fifo_regio(struct hfc_multi *hc, u_char *data, int len)
@ -526,7 +529,6 @@ read_fifo_pcimem(struct hfc_multi *hc, u_char *data, int len)
} }
} }
static void static void
enable_hwirq(struct hfc_multi *hc) enable_hwirq(struct hfc_multi *hc)
{ {
@ -1011,7 +1013,7 @@ plxsd_checksync(struct hfc_multi *hc, int rm)
if (hc->syncronized) { if (hc->syncronized) {
if (syncmaster == NULL) { if (syncmaster == NULL) {
if (debug & DEBUG_HFCMULTI_PLXSD) if (debug & DEBUG_HFCMULTI_PLXSD)
printk(KERN_WARNING "%s: GOT sync on card %d" printk(KERN_DEBUG "%s: GOT sync on card %d"
" (id=%d)\n", __func__, hc->id + 1, " (id=%d)\n", __func__, hc->id + 1,
hc->id); hc->id);
hfcmulti_resync(hc, hc, rm); hfcmulti_resync(hc, hc, rm);
@ -1019,7 +1021,7 @@ plxsd_checksync(struct hfc_multi *hc, int rm)
} else { } else {
if (syncmaster == hc) { if (syncmaster == hc) {
if (debug & DEBUG_HFCMULTI_PLXSD) if (debug & DEBUG_HFCMULTI_PLXSD)
printk(KERN_WARNING "%s: LOST sync on card %d" printk(KERN_DEBUG "%s: LOST sync on card %d"
" (id=%d)\n", __func__, hc->id + 1, " (id=%d)\n", __func__, hc->id + 1,
hc->id); hc->id);
hfcmulti_resync(hc, NULL, rm); hfcmulti_resync(hc, NULL, rm);
@ -1068,7 +1070,7 @@ release_io_hfcmulti(struct hfc_multi *hc)
pv &= ~PLX_DSP_RES_N; pv &= ~PLX_DSP_RES_N;
writel(pv, plx_acc_32); writel(pv, plx_acc_32);
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_WARNING "%s: PCM off: PLX_GPIO=%x\n", printk(KERN_DEBUG "%s: PCM off: PLX_GPIO=%x\n",
__func__, pv); __func__, pv);
spin_unlock_irqrestore(&plx_lock, plx_flags); spin_unlock_irqrestore(&plx_lock, plx_flags);
} }
@ -1119,8 +1121,8 @@ init_chip(struct hfc_multi *hc)
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_DEBUG "%s: entered\n", __func__); printk(KERN_DEBUG "%s: entered\n", __func__);
val = HFC_inb(hc, R_CHIP_ID); val = HFC_inb(hc, R_CHIP_ID);
if ((val>>4) != 0x8 && (val>>4) != 0xc && (val>>4) != 0xe if ((val >> 4) != 0x8 && (val >> 4) != 0xc && (val >> 4) != 0xe &&
&& (val>>1) != 0x31) { (val >> 1) != 0x31) {
printk(KERN_INFO "HFC_multi: unknown CHIP_ID:%x\n", (u_int)val); printk(KERN_INFO "HFC_multi: unknown CHIP_ID:%x\n", (u_int)val);
err = -EIO; err = -EIO;
goto out; goto out;
@ -1202,7 +1204,7 @@ init_chip(struct hfc_multi *hc)
writel(pv, plx_acc_32); writel(pv, plx_acc_32);
spin_unlock_irqrestore(&plx_lock, plx_flags); spin_unlock_irqrestore(&plx_lock, plx_flags);
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_WARNING "%s: slave/term: PLX_GPIO=%x\n", printk(KERN_DEBUG "%s: slave/term: PLX_GPIO=%x\n",
__func__, pv); __func__, pv);
/* /*
* If we are the 3rd PLXSD card or higher, we must turn * If we are the 3rd PLXSD card or higher, we must turn
@ -1230,7 +1232,8 @@ init_chip(struct hfc_multi *hc)
writel(pv, plx_acc_32); writel(pv, plx_acc_32);
spin_unlock_irqrestore(&plx_lock, plx_flags); spin_unlock_irqrestore(&plx_lock, plx_flags);
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_WARNING "%s: term off: PLX_GPIO=%x\n", printk(KERN_DEBUG
"%s: term off: PLX_GPIO=%x\n",
__func__, pv); __func__, pv);
} }
spin_unlock_irqrestore(&HFClock, hfc_flags); spin_unlock_irqrestore(&HFClock, hfc_flags);
@ -1292,13 +1295,13 @@ init_chip(struct hfc_multi *hc)
pv |= PLX_MASTER_EN | PLX_SLAVE_EN_N; pv |= PLX_MASTER_EN | PLX_SLAVE_EN_N;
pv |= PLX_SYNC_O_EN; pv |= PLX_SYNC_O_EN;
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_WARNING "%s: master: PLX_GPIO=%x\n", printk(KERN_DEBUG "%s: master: PLX_GPIO=%x\n",
__func__, pv); __func__, pv);
} else { } else {
pv &= ~(PLX_MASTER_EN | PLX_SLAVE_EN_N); pv &= ~(PLX_MASTER_EN | PLX_SLAVE_EN_N);
pv &= ~PLX_SYNC_O_EN; pv &= ~PLX_SYNC_O_EN;
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_WARNING "%s: slave: PLX_GPIO=%x\n", printk(KERN_DEBUG "%s: slave: PLX_GPIO=%x\n",
__func__, pv); __func__, pv);
} }
writel(pv, plx_acc_32); writel(pv, plx_acc_32);
@ -1410,8 +1413,8 @@ init_chip(struct hfc_multi *hc)
writel(pv, plx_acc_32); writel(pv, plx_acc_32);
spin_unlock_irqrestore(&plx_lock, plx_flags); spin_unlock_irqrestore(&plx_lock, plx_flags);
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_WARNING "%s: master: PLX_GPIO" printk(KERN_DEBUG "%s: master: "
"=%x\n", __func__, pv); "PLX_GPIO=%x\n", __func__, pv);
} }
hc->hw.r_pcm_md0 |= V_PCM_MD; hc->hw.r_pcm_md0 |= V_PCM_MD;
HFC_outb(hc, R_PCM_MD0, hc->hw.r_pcm_md0 | 0x00); HFC_outb(hc, R_PCM_MD0, hc->hw.r_pcm_md0 | 0x00);
@ -1445,7 +1448,7 @@ init_chip(struct hfc_multi *hc)
writel(pv, plx_acc_32); writel(pv, plx_acc_32);
spin_unlock_irqrestore(&plx_lock, plx_flags); spin_unlock_irqrestore(&plx_lock, plx_flags);
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_WARNING "%s: reset off: PLX_GPIO=%x\n", printk(KERN_DEBUG "%s: reset off: PLX_GPIO=%x\n",
__func__, pv); __func__, pv);
} }
@ -1878,7 +1881,7 @@ hfcmulti_dtmf(struct hfc_multi *hc)
hc->chan[ch].coeff_count = 0; hc->chan[ch].coeff_count = 0;
skb = mI_alloc_skb(512, GFP_ATOMIC); skb = mI_alloc_skb(512, GFP_ATOMIC);
if (!skb) { if (!skb) {
printk(KERN_WARNING "%s: No memory for skb\n", printk(KERN_DEBUG "%s: No memory for skb\n",
__func__); __func__);
continue; continue;
} }
@ -2780,13 +2783,13 @@ hfcmulti_interrupt(int intno, void *dev_id)
handle_timer_irq(hc); handle_timer_irq(hc);
} }
if (r_irq_misc & V_DTMF_IRQ) { if (r_irq_misc & V_DTMF_IRQ)
hfcmulti_dtmf(hc); hfcmulti_dtmf(hc);
}
if (r_irq_misc & V_IRQ_PROC) { if (r_irq_misc & V_IRQ_PROC) {
static int irq_proc_cnt; static int irq_proc_cnt;
if (!irq_proc_cnt++) if (!irq_proc_cnt++)
printk(KERN_WARNING "%s: got V_IRQ_PROC -" printk(KERN_DEBUG "%s: got V_IRQ_PROC -"
" this should not happen\n", __func__); " this should not happen\n", __func__);
} }
@ -3716,8 +3719,7 @@ ph_state_change(struct dchannel *dch)
int ch, i; int ch, i;
if (!dch) { if (!dch) {
printk(KERN_WARNING "%s: ERROR given dch is NULL\n", printk(KERN_WARNING "%s: ERROR given dch is NULL\n", __func__);
__func__);
return; return;
} }
hc = dch->hw; hc = dch->hw;
@ -3740,10 +3742,11 @@ ph_state_change(struct dchannel *dch)
if (hc->e1_state != 1) { if (hc->e1_state != 1) {
for (i = 1; i <= 31; i++) { for (i = 1; i <= 31; i++) {
/* reset fifos on e1 activation */ /* reset fifos on e1 activation */
HFC_outb_nodebug(hc, R_FIFO, (i << 1) | 1); HFC_outb_nodebug(hc, R_FIFO,
(i << 1) | 1);
HFC_wait_nodebug(hc); HFC_wait_nodebug(hc);
HFC_outb_nodebug(hc, HFC_outb_nodebug(hc, R_INC_RES_FIFO,
R_INC_RES_FIFO, V_RES_F); V_RES_F);
HFC_wait_nodebug(hc); HFC_wait_nodebug(hc);
} }
} }
@ -4046,11 +4049,11 @@ open_dchannel(struct hfc_multi *hc, struct dchannel *dch,
if ((dch->dev.D.protocol != ISDN_P_NONE) && if ((dch->dev.D.protocol != ISDN_P_NONE) &&
(dch->dev.D.protocol != rq->protocol)) { (dch->dev.D.protocol != rq->protocol)) {
if (debug & DEBUG_HFCMULTI_MODE) if (debug & DEBUG_HFCMULTI_MODE)
printk(KERN_WARNING "%s: change protocol %x to %x\n", printk(KERN_DEBUG "%s: change protocol %x to %x\n",
__func__, dch->dev.D.protocol, rq->protocol); __func__, dch->dev.D.protocol, rq->protocol);
} }
if ((dch->dev.D.protocol == ISDN_P_TE_S0) if ((dch->dev.D.protocol == ISDN_P_TE_S0) &&
&& (rq->protocol != ISDN_P_TE_S0)) (rq->protocol != ISDN_P_TE_S0))
l1_event(dch->l1, CLOSE_CHANNEL); l1_event(dch->l1, CLOSE_CHANNEL);
if (dch->dev.D.protocol != rq->protocol) { if (dch->dev.D.protocol != rq->protocol) {
if (rq->protocol == ISDN_P_TE_S0) { if (rq->protocol == ISDN_P_TE_S0) {
@ -4127,9 +4130,9 @@ channel_dctrl(struct dchannel *dch, struct mISDN_ctrl_req *cq)
wd_cnt = cq->p1 & 0xf; wd_cnt = cq->p1 & 0xf;
wd_mode = !!(cq->p1 >> 4); wd_mode = !!(cq->p1 >> 4);
if (debug & DEBUG_HFCMULTI_MSG) if (debug & DEBUG_HFCMULTI_MSG)
printk(KERN_DEBUG printk(KERN_DEBUG "%s: MISDN_CTRL_HFC_WD_INIT mode %s"
"%s: MISDN_CTRL_HFC_WD_INIT mode %s counter 0x%x\n", ", counter 0x%x\n", __func__,
__func__, wd_mode ? "AUTO" : "MANUAL", wd_cnt); wd_mode ? "AUTO" : "MANUAL", wd_cnt);
/* set the watchdog timer */ /* set the watchdog timer */
HFC_outb(hc, R_TI_WD, poll_timer | (wd_cnt << 4)); HFC_outb(hc, R_TI_WD, poll_timer | (wd_cnt << 4));
hc->hw.r_bert_wd_md = (wd_mode ? V_AUTO_WD_RES : 0); hc->hw.r_bert_wd_md = (wd_mode ? V_AUTO_WD_RES : 0);
@ -4319,7 +4322,7 @@ init_card(struct hfc_multi *hc)
} }
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_WARNING "%s: free irq %d\n", __func__, hc->irq); printk(KERN_DEBUG "%s: free irq %d\n", __func__, hc->irq);
if (hc->irq) { if (hc->irq) {
free_irq(hc->irq, hc); free_irq(hc->irq, hc);
hc->irq = 0; hc->irq = 0;
@ -4624,7 +4627,7 @@ release_card(struct hfc_multi *hc)
int ch; int ch;
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_WARNING "%s: release card (%d) entered\n", printk(KERN_DEBUG "%s: release card (%d) entered\n",
__func__, hc->id); __func__, hc->id);
/* unregister clock source */ /* unregister clock source */
@ -4653,7 +4656,7 @@ release_card(struct hfc_multi *hc)
/* release hardware & irq */ /* release hardware & irq */
if (hc->irq) { if (hc->irq) {
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_WARNING "%s: free irq %d\n", printk(KERN_DEBUG "%s: free irq %d\n",
__func__, hc->irq); __func__, hc->irq);
free_irq(hc->irq, hc); free_irq(hc->irq, hc);
hc->irq = 0; hc->irq = 0;
@ -4662,17 +4665,17 @@ release_card(struct hfc_multi *hc)
release_io_hfcmulti(hc); release_io_hfcmulti(hc);
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_WARNING "%s: remove instance from list\n", printk(KERN_DEBUG "%s: remove instance from list\n",
__func__); __func__);
list_del(&hc->list); list_del(&hc->list);
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_WARNING "%s: delete instance\n", __func__); printk(KERN_DEBUG "%s: delete instance\n", __func__);
if (hc == syncmaster) if (hc == syncmaster)
syncmaster = NULL; syncmaster = NULL;
kfree(hc); kfree(hc);
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_WARNING "%s: card successfully removed\n", printk(KERN_DEBUG "%s: card successfully removed\n",
__func__); __func__);
} }
@ -5222,7 +5225,7 @@ static void __devexit hfc_remove_pci(struct pci_dev *pdev)
spin_unlock_irqrestore(&HFClock, flags); spin_unlock_irqrestore(&HFClock, flags);
} else { } else {
if (debug) if (debug)
printk(KERN_WARNING "%s: drvdata allready removed\n", printk(KERN_DEBUG "%s: drvdata allready removed\n",
__func__); __func__);
} }
} }

16
drivers/isdn/hardware/mISDN/hfcpci.c
View File

@ -257,7 +257,7 @@ reset_hfcpci(struct hfc_pci *hc)
Write_hfc(hc, HFCPCI_INT_M1, hc->hw.int_m1); Write_hfc(hc, HFCPCI_INT_M1, hc->hw.int_m1);
/* Clear already pending ints */ /* Clear already pending ints */
if (Read_hfc(hc, HFCPCI_INT_S1)); val = Read_hfc(hc, HFCPCI_INT_S1);
/* set NT/TE mode */ /* set NT/TE mode */
hfcpci_setmode(hc); hfcpci_setmode(hc);
@ -499,7 +499,8 @@ receive_dmsg(struct hfc_pci *hc)
df->f2 = ((df->f2 + 1) & MAX_D_FRAMES) | df->f2 = ((df->f2 + 1) & MAX_D_FRAMES) |
(MAX_D_FRAMES + 1); /* next buffer */ (MAX_D_FRAMES + 1); /* next buffer */
df->za[df->f2 & D_FREG_MASK].z2 = df->za[df->f2 & D_FREG_MASK].z2 =
cpu_to_le16((le16_to_cpu(zp->z2) + rcnt) & (D_FIFO_SIZE - 1)); cpu_to_le16((le16_to_cpu(zp->z2) + rcnt) &
(D_FIFO_SIZE - 1));
} else { } else {
dch->rx_skb = mI_alloc_skb(rcnt - 3, GFP_ATOMIC); dch->rx_skb = mI_alloc_skb(rcnt - 3, GFP_ATOMIC);
if (!dch->rx_skb) { if (!dch->rx_skb) {
@ -966,6 +967,7 @@ static void
ph_state_nt(struct dchannel *dch) ph_state_nt(struct dchannel *dch)
{ {
struct hfc_pci *hc = dch->hw; struct hfc_pci *hc = dch->hw;
u_char val;
if (dch->debug) if (dch->debug)
printk(KERN_DEBUG "%s: NT newstate %x\n", printk(KERN_DEBUG "%s: NT newstate %x\n",
@ -979,7 +981,7 @@ ph_state_nt(struct dchannel *dch)
hc->hw.int_m1 &= ~HFCPCI_INTS_TIMER; hc->hw.int_m1 &= ~HFCPCI_INTS_TIMER;
Write_hfc(hc, HFCPCI_INT_M1, hc->hw.int_m1); Write_hfc(hc, HFCPCI_INT_M1, hc->hw.int_m1);
/* Clear already pending ints */ /* Clear already pending ints */
if (Read_hfc(hc, HFCPCI_INT_S1)); val = Read_hfc(hc, HFCPCI_INT_S1);
Write_hfc(hc, HFCPCI_STATES, 4 | HFCPCI_LOAD_STATE); Write_hfc(hc, HFCPCI_STATES, 4 | HFCPCI_LOAD_STATE);
udelay(10); udelay(10);
Write_hfc(hc, HFCPCI_STATES, 4); Write_hfc(hc, HFCPCI_STATES, 4);
@ -1268,8 +1270,7 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol)
rx_slot = (bc>>8) & 0xff; rx_slot = (bc>>8) & 0xff;
tx_slot = (bc>>16) & 0xff; tx_slot = (bc>>16) & 0xff;
bc = bc & 0xff; bc = bc & 0xff;
} else if (test_bit(HFC_CFG_PCM, &hc->cfg) && } else if (test_bit(HFC_CFG_PCM, &hc->cfg) && (protocol > ISDN_P_NONE))
(protocol > ISDN_P_NONE))
printk(KERN_WARNING "%s: no pcm channel id but HFC_CFG_PCM\n", printk(KERN_WARNING "%s: no pcm channel id but HFC_CFG_PCM\n",
__func__); __func__);
if (hc->chanlimit > 1) { if (hc->chanlimit > 1) {
@ -2047,7 +2048,8 @@ setup_hw(struct hfc_pci *hc)
printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n"); printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n");
return 1; return 1;
} }
hc->hw.pci_io = (char __iomem *)(unsigned long)hc->pdev->resource[1].start; hc->hw.pci_io =
(char __iomem *)(unsigned long)hc->pdev->resource[1].start;
if (!hc->hw.pci_io) { if (!hc->hw.pci_io) {
printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n"); printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n");
@ -2289,7 +2291,7 @@ hfc_remove_pci(struct pci_dev *pdev)
release_card(card); release_card(card);
else else
if (debug) if (debug)
printk(KERN_WARNING "%s: drvdata already removed\n", printk(KERN_DEBUG "%s: drvdata already removed\n",
__func__); __func__);
} }

3
drivers/isdn/mISDN/dsp_audio.c
View File

@ -210,10 +210,9 @@ dsp_audio_generate_seven(void)
j = 0; j = 0;
for (k = 0; k < 256; k++) { for (k = 0; k < 256; k++) {
if (dsp_audio_alaw_to_s32[k] if (dsp_audio_alaw_to_s32[k]
< dsp_audio_alaw_to_s32[i]) { < dsp_audio_alaw_to_s32[i])
j++; j++;
} }
}
sorted_alaw[j] = i; sorted_alaw[j] = i;
} }

7
drivers/isdn/mISDN/dsp_cmx.c
View File

@ -238,7 +238,7 @@ dsp_cmx_add_conf_member(struct dsp *dsp, struct dsp_conf *conf)
member = kzalloc(sizeof(struct dsp_conf_member), GFP_ATOMIC); member = kzalloc(sizeof(struct dsp_conf_member), GFP_ATOMIC);
if (!member) { if (!member) {
printk(KERN_ERR "kmalloc struct dsp_conf_member failed\n"); printk(KERN_ERR "kzalloc struct dsp_conf_member failed\n");
return -ENOMEM; return -ENOMEM;
} }
member->dsp = dsp; member->dsp = dsp;
@ -317,7 +317,7 @@ static struct dsp_conf
conf = kzalloc(sizeof(struct dsp_conf), GFP_ATOMIC); conf = kzalloc(sizeof(struct dsp_conf), GFP_ATOMIC);
if (!conf) { if (!conf) {
printk(KERN_ERR "kmalloc struct dsp_conf failed\n"); printk(KERN_ERR "kzalloc struct dsp_conf failed\n");
return NULL; return NULL;
} }
INIT_LIST_HEAD(&conf->mlist); INIT_LIST_HEAD(&conf->mlist);
@ -1389,7 +1389,8 @@ dsp_cmx_send_member(struct dsp *dsp, int len, s32 *c, int members)
while (r != rr && t != tt) { while (r != rr && t != tt) {
#ifdef CMX_TX_DEBUG #ifdef CMX_TX_DEBUG
if (strlen(debugbuf) < 48) if (strlen(debugbuf) < 48)
sprintf(debugbuf+strlen(debugbuf), " %02x", p[t]); sprintf(debugbuf+strlen(debugbuf), " %02x",
p[t]);
#endif #endif
*d++ = p[t]; /* write tx_buff */ *d++ = p[t]; /* write tx_buff */
t = (t+1) & CMX_BUFF_MASK; t = (t+1) & CMX_BUFF_MASK;

6
drivers/isdn/mISDN/dsp_core.c
View File

@ -558,7 +558,7 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb)
dsp->pipeline.inuse = 1; dsp->pipeline.inuse = 1;
dsp_cmx_hardware(dsp->conf, dsp); dsp_cmx_hardware(dsp->conf, dsp);
ret = dsp_pipeline_build(&dsp->pipeline, ret = dsp_pipeline_build(&dsp->pipeline,
len > 0 ? (char *)data : NULL); len > 0 ? data : NULL);
dsp_cmx_hardware(dsp->conf, dsp); dsp_cmx_hardware(dsp->conf, dsp);
dsp_rx_off(dsp); dsp_rx_off(dsp);
} }
@ -1176,8 +1176,8 @@ static int dsp_init(void)
/* init conversion tables */ /* init conversion tables */
dsp_audio_generate_law_tables(); dsp_audio_generate_law_tables();
dsp_silence = (dsp_options&DSP_OPT_ULAW) ? 0xff : 0x2a; dsp_silence = (dsp_options&DSP_OPT_ULAW) ? 0xff : 0x2a;
dsp_audio_law_to_s32 = (dsp_options&DSP_OPT_ULAW)?dsp_audio_ulaw_to_s32: dsp_audio_law_to_s32 = (dsp_options&DSP_OPT_ULAW) ?
dsp_audio_alaw_to_s32; dsp_audio_ulaw_to_s32 : dsp_audio_alaw_to_s32;
dsp_audio_generate_s2law_table(); dsp_audio_generate_s2law_table();
dsp_audio_generate_seven(); dsp_audio_generate_seven();
dsp_audio_generate_mix_table(); dsp_audio_generate_mix_table();

21
drivers/isdn/mISDN/dsp_tones.c
View File

@ -253,18 +253,24 @@ static struct pattern {
{8000, 0, 0, 0, 0, 0, 0, 0, 0, 0} }, {8000, 0, 0, 0, 0, 0, 0, 0, 0, 0} },
{TONE_GERMAN_DIALPBX, {TONE_GERMAN_DIALPBX,
{DATA_GA, DATA_S, DATA_GA, DATA_S, DATA_GA, DATA_S, NULL, NULL, NULL, NULL}, {DATA_GA, DATA_S, DATA_GA, DATA_S, DATA_GA, DATA_S, NULL, NULL, NULL,
{SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, NULL, NULL, NULL, NULL}, NULL},
{SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, NULL, NULL, NULL,
NULL},
{2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} }, {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} },
{TONE_GERMAN_OLDDIALPBX, {TONE_GERMAN_OLDDIALPBX,
{DATA_GO, DATA_S, DATA_GO, DATA_S, DATA_GO, DATA_S, NULL, NULL, NULL, NULL}, {DATA_GO, DATA_S, DATA_GO, DATA_S, DATA_GO, DATA_S, NULL, NULL, NULL,
{SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, NULL, NULL, NULL, NULL}, NULL},
{SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, NULL, NULL, NULL,
NULL},
{2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} }, {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} },
{TONE_AMERICAN_DIALPBX, {TONE_AMERICAN_DIALPBX,
{DATA_DT, DATA_S, DATA_DT, DATA_S, DATA_DT, DATA_S, NULL, NULL, NULL, NULL}, {DATA_DT, DATA_S, DATA_DT, DATA_S, DATA_DT, DATA_S, NULL, NULL, NULL,
{SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, NULL, NULL, NULL, NULL}, NULL},
{SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, NULL, NULL, NULL,
NULL},
{2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} }, {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} },
{TONE_GERMAN_RINGING, {TONE_GERMAN_RINGING,
@ -498,8 +504,7 @@ dsp_tone(struct dsp *dsp, int tone)
/* we turn off the tone */ /* we turn off the tone */
if (!tone) { if (!tone) {
if (dsp->features.hfc_loops) if (dsp->features.hfc_loops && timer_pending(&tonet->tl))
if (timer_pending(&tonet->tl))
del_timer(&tonet->tl); del_timer(&tonet->tl);
if (dsp->features.hfc_loops) if (dsp->features.hfc_loops)
dsp_tone_hw_message(dsp, NULL, 0); dsp_tone_hw_message(dsp, NULL, 0);

8
drivers/isdn/mISDN/l1oip_core.c
View File

@ -749,8 +749,8 @@ l1oip_socket_thread(void *data)
l1oip_socket_parse(hc, &sin_rx, recvbuf, recvlen); l1oip_socket_parse(hc, &sin_rx, recvbuf, recvlen);
} else { } else {
if (debug & DEBUG_L1OIP_SOCKET) if (debug & DEBUG_L1OIP_SOCKET)
printk(KERN_WARNING "%s: broken pipe on socket\n", printk(KERN_WARNING
__func__); "%s: broken pipe on socket\n", __func__);
} }
} }
@ -1518,8 +1518,8 @@ l1oip_init(void)
if (debug & DEBUG_L1OIP_INIT) if (debug & DEBUG_L1OIP_INIT)
printk(KERN_DEBUG "%s: interface %d is %s with %s.\n", printk(KERN_DEBUG "%s: interface %d is %s with %s.\n",
__func__, l1oip_cnt, pri ? "PRI" : "BRI", __func__, l1oip_cnt, pri ? "PRI" : "BRI",
bundle?"bundled IP packet for all B-channels" bundle ? "bundled IP packet for all B-channels" :
:"seperate IP packets for every B-channel"); "seperate IP packets for every B-channel");
hc = kzalloc(sizeof(struct l1oip), GFP_ATOMIC); hc = kzalloc(sizeof(struct l1oip), GFP_ATOMIC);
if (!hc) { if (!hc) {

1
drivers/isdn/mISDN/tei.c
View File

@ -872,7 +872,6 @@ ph_data_ind(struct manager *mgr, struct sk_buff *skb)
__func__, skb->len); __func__, skb->len);
goto done; goto done;
} }
if (*debug & DEBUG_L2_TEI)
if ((skb->data[0] >> 2) != TEI_SAPI) /* not for us */ if ((skb->data[0] >> 2) != TEI_SAPI) /* not for us */
goto done; goto done;

2
drivers/isdn/mISDN/timerdev.c
View File

@ -259,7 +259,7 @@ mISDN_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
return ret; return ret;
} }
static struct file_operations mISDN_fops = { static const struct file_operations mISDN_fops = {
.read = mISDN_read, .read = mISDN_read,
.poll = mISDN_poll, .poll = mISDN_poll,
.ioctl = mISDN_ioctl, .ioctl = mISDN_ioctl,