mISDN: Cleanup debug messages (eac74af9) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/isdn/hardware/mISDN/hfcmulti.c

+81 −78

Original line number	Diff line number	Diff line
		@@ -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)
		#endif
		{
		writeb(val, (hc->pci_membase)+reg);
		writeb(val, hc->pci_membase + reg);
		}
		static u_char
		#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)
		#endif
		{
		return readb((hc->pci_membase)+reg);
		return readb(hc->pci_membase + reg);
		}
		static u_short
		#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)
		#endif
		{
		return readw((hc->pci_membase)+reg);
		return readw(hc->pci_membase + reg);
		}
		static void
		#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)
		#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 */
		@@ -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)
		#endif
		{
		outb(reg, (hc->pci_iobase)+4);
		outb(reg, hc->pci_iobase + 4);
		outb(val, hc->pci_iobase);
		}
		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)
		#endif
		{
		outb(reg, (hc->pci_iobase)+4);
		outb(reg, hc->pci_iobase + 4);
		return inb(hc->pci_iobase);
		}
		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)
		#endif
		{
		outb(reg, (hc->pci_iobase)+4);
		outb(reg, hc->pci_iobase + 4);
		return inw(hc->pci_iobase);
		}
		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)
		#endif
		{
		outb(R_STATUS, (hc->pci_iobase)+4);
		while (inb(hc->pci_iobase) & V_BUSY);
		outb(R_STATUS, hc->pci_iobase + 4);
		while (inb(hc->pci_iobase) & V_BUSY)
		cpu_relax();
		}

		#ifdef HFC_REGISTER_DEBUG
		@@ -481,6 +483,7 @@ write_fifo_pcimem(struct hfc_multi hc, u_char data, int len)
		len--;
		}
		}

		/* read fifo data (REGIO) */
		static void
		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
		enable_hwirq(struct hfc_multi *hc)
		{
		@@ -1011,7 +1013,7 @@ plxsd_checksync(struct hfc_multi *hc, int rm)
		if (hc->syncronized) {
		if (syncmaster == NULL) {
		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,
		hc->id);
		hfcmulti_resync(hc, hc, rm);
		@@ -1019,7 +1021,7 @@ plxsd_checksync(struct hfc_multi *hc, int rm)
		} else {
		if (syncmaster == hc) {
		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,
		hc->id);
		hfcmulti_resync(hc, NULL, rm);
		@@ -1068,7 +1070,7 @@ release_io_hfcmulti(struct hfc_multi *hc)
		pv &= ~PLX_DSP_RES_N;
		writel(pv, plx_acc_32);
		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);
		spin_unlock_irqrestore(&plx_lock, plx_flags);
		}
		@@ -1119,8 +1121,8 @@ init_chip(struct hfc_multi *hc)
		if (debug & DEBUG_HFCMULTI_INIT)
		printk(KERN_DEBUG "%s: entered\n", __func__);
		val = HFC_inb(hc, R_CHIP_ID);
		if ((val>>4) != 0x8 && (val>>4) != 0xc && (val>>4) != 0xe
		&& (val>>1) != 0x31) {
		if ((val >> 4) != 0x8 && (val >> 4) != 0xc && (val >> 4) != 0xe &&
		(val >> 1) != 0x31) {
		printk(KERN_INFO "HFC_multi: unknown CHIP_ID:%x\n", (u_int)val);
		err = -EIO;
		goto out;
		@@ -1202,7 +1204,7 @@ init_chip(struct hfc_multi *hc)
		writel(pv, plx_acc_32);
		spin_unlock_irqrestore(&plx_lock, plx_flags);
		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);
		/*
		* 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);
		spin_unlock_irqrestore(&plx_lock, plx_flags);
		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);
		}
		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_SYNC_O_EN;
		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);
		} else {
		pv &= ~(PLX_MASTER_EN \| PLX_SLAVE_EN_N);
		pv &= ~PLX_SYNC_O_EN;
		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);
		}
		writel(pv, plx_acc_32);
		@@ -1410,8 +1413,8 @@ controller_fail:
		writel(pv, plx_acc_32);
		spin_unlock_irqrestore(&plx_lock, plx_flags);
		if (debug & DEBUG_HFCMULTI_INIT)
		printk(KERN_WARNING "%s: master: PLX_GPIO"
		"=%x\n", __func__, pv);
		printk(KERN_DEBUG "%s: master: "
		"PLX_GPIO=%x\n", __func__, pv);
		}
		hc->hw.r_pcm_md0 \|= V_PCM_MD;
		HFC_outb(hc, R_PCM_MD0, hc->hw.r_pcm_md0 \| 0x00);
		@@ -1445,7 +1448,7 @@ controller_fail:
		writel(pv, plx_acc_32);
		spin_unlock_irqrestore(&plx_lock, plx_flags);
		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);
		}

		@@ -1878,7 +1881,7 @@ hfcmulti_dtmf(struct hfc_multi *hc)
		hc->chan[ch].coeff_count = 0;
		skb = mI_alloc_skb(512, GFP_ATOMIC);
		if (!skb) {
		printk(KERN_WARNING "%s: No memory for skb\n",
		printk(KERN_DEBUG "%s: No memory for skb\n",
		__func__);
		continue;
		}
		@@ -2780,13 +2783,13 @@ hfcmulti_interrupt(int intno, void *dev_id)
		handle_timer_irq(hc);
		}

		if (r_irq_misc & V_DTMF_IRQ) {
		if (r_irq_misc & V_DTMF_IRQ)
		hfcmulti_dtmf(hc);
		}

		if (r_irq_misc & V_IRQ_PROC) {
		static int 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__);
		}

		@@ -3716,8 +3719,7 @@ ph_state_change(struct dchannel *dch)
		int ch, i;

		if (!dch) {
		printk(KERN_WARNING "%s: ERROR given dch is NULL\n",
		__func__);
		printk(KERN_WARNING "%s: ERROR given dch is NULL\n", __func__);
		return;
		}
		hc = dch->hw;
		@@ -3740,10 +3742,11 @@ ph_state_change(struct dchannel *dch)
		if (hc->e1_state != 1) {
		for (i = 1; i <= 31; i++) {
		/* 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_outb_nodebug(hc,
		R_INC_RES_FIFO, V_RES_F);
		HFC_outb_nodebug(hc, R_INC_RES_FIFO,
		V_RES_F);
		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) &&
		(dch->dev.D.protocol != rq->protocol)) {
		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);
		}
		if ((dch->dev.D.protocol == ISDN_P_TE_S0)
		&& (rq->protocol != ISDN_P_TE_S0))
		if ((dch->dev.D.protocol == ISDN_P_TE_S0) &&
		(rq->protocol != ISDN_P_TE_S0))
		l1_event(dch->l1, CLOSE_CHANNEL);
		if (dch->dev.D.protocol != rq->protocol) {
		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_mode = !!(cq->p1 >> 4);
		if (debug & DEBUG_HFCMULTI_MSG)
		printk(KERN_DEBUG
		"%s: MISDN_CTRL_HFC_WD_INIT mode %s counter 0x%x\n",
		__func__, wd_mode ? "AUTO" : "MANUAL", wd_cnt);
		printk(KERN_DEBUG "%s: MISDN_CTRL_HFC_WD_INIT mode %s"
		", counter 0x%x\n", __func__,
		wd_mode ? "AUTO" : "MANUAL", wd_cnt);
		/* set the watchdog timer */
		HFC_outb(hc, R_TI_WD, poll_timer \| (wd_cnt << 4));
		hc->hw.r_bert_wd_md = (wd_mode ? V_AUTO_WD_RES : 0);
		@@ -4319,7 +4322,7 @@ error:
		}

		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) {
		free_irq(hc->irq, hc);
		hc->irq = 0;
		@@ -4624,7 +4627,7 @@ release_card(struct hfc_multi *hc)
		int ch;

		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);

		/* unregister clock source */
		@@ -4653,7 +4656,7 @@ release_card(struct hfc_multi *hc)
		/* release hardware & irq */
		if (hc->irq) {
		if (debug & DEBUG_HFCMULTI_INIT)
		printk(KERN_WARNING "%s: free irq %d\n",
		printk(KERN_DEBUG "%s: free irq %d\n",
		__func__, hc->irq);
		free_irq(hc->irq, hc);
		hc->irq = 0;
		@@ -4662,17 +4665,17 @@ release_card(struct hfc_multi *hc)
		release_io_hfcmulti(hc);

		if (debug & DEBUG_HFCMULTI_INIT)
		printk(KERN_WARNING "%s: remove instance from list\n",
		printk(KERN_DEBUG "%s: remove instance from list\n",
		__func__);
		list_del(&hc->list);

		if (debug & DEBUG_HFCMULTI_INIT)
		printk(KERN_WARNING "%s: delete instance\n", __func__);
		printk(KERN_DEBUG "%s: delete instance\n", __func__);
		if (hc == syncmaster)
		syncmaster = NULL;
		kfree(hc);
		if (debug & DEBUG_HFCMULTI_INIT)
		printk(KERN_WARNING "%s: card successfully removed\n",
		printk(KERN_DEBUG "%s: card successfully removed\n",
		__func__);
		}

		@@ -5222,7 +5225,7 @@ static void __devexit hfc_remove_pci(struct pci_dev *pdev)
		spin_unlock_irqrestore(&HFClock, flags);
		} else {
		if (debug)
		printk(KERN_WARNING "%s: drvdata allready removed\n",
		printk(KERN_DEBUG "%s: drvdata allready removed\n",
		__func__);
		}
		}

drivers/isdn/hardware/mISDN/hfcpci.c

+15 −13

Original line number	Diff line number	Diff line
		@@ -257,7 +257,7 @@ reset_hfcpci(struct hfc_pci *hc)
		Write_hfc(hc, HFCPCI_INT_M1, hc->hw.int_m1);

		/* Clear already pending ints */
		if (Read_hfc(hc, HFCPCI_INT_S1));
		val = Read_hfc(hc, HFCPCI_INT_S1);

		/* set NT/TE mode */
		hfcpci_setmode(hc);
		@@ -499,7 +499,8 @@ receive_dmsg(struct hfc_pci *hc)
		df->f2 = ((df->f2 + 1) & MAX_D_FRAMES) \|
		(MAX_D_FRAMES + 1); /* next buffer */
		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 {
		dch->rx_skb = mI_alloc_skb(rcnt - 3, GFP_ATOMIC);
		if (!dch->rx_skb) {
		@@ -966,6 +967,7 @@ static void
		ph_state_nt(struct dchannel *dch)
		{
		struct hfc_pci *hc = dch->hw;
		u_char val;

		if (dch->debug)
		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;
		Write_hfc(hc, HFCPCI_INT_M1, hc->hw.int_m1);
		/* 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);
		udelay(10);
		Write_hfc(hc, HFCPCI_STATES, 4);
		@@ -1268,8 +1270,7 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol)
		rx_slot = (bc>>8) & 0xff;
		tx_slot = (bc>>16) & 0xff;
		bc = bc & 0xff;
		} else if (test_bit(HFC_CFG_PCM, &hc->cfg) &&
		(protocol > ISDN_P_NONE))
		} else if (test_bit(HFC_CFG_PCM, &hc->cfg) && (protocol > ISDN_P_NONE))
		printk(KERN_WARNING "%s: no pcm channel id but HFC_CFG_PCM\n",
		__func__);
		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");
		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) {
		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);
		else
		if (debug)
		printk(KERN_WARNING "%s: drvdata already removed\n",
		printk(KERN_DEBUG "%s: drvdata already removed\n",
		__func__);
		}

drivers/isdn/mISDN/dsp_audio.c

+2 −3

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

drivers/isdn/mISDN/dsp_cmx.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -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);
		if (!member) {
		printk(KERN_ERR "kmalloc struct dsp_conf_member failed\n");
		printk(KERN_ERR "kzalloc struct dsp_conf_member failed\n");
		return -ENOMEM;
		}
		member->dsp = dsp;
		@@ -317,7 +317,7 @@ static struct dsp_conf

		conf = kzalloc(sizeof(struct dsp_conf), GFP_ATOMIC);
		if (!conf) {
		printk(KERN_ERR "kmalloc struct dsp_conf failed\n");
		printk(KERN_ERR "kzalloc struct dsp_conf failed\n");
		return NULL;
		}
		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) {
		#ifdef CMX_TX_DEBUG
		if (strlen(debugbuf) < 48)
		sprintf(debugbuf+strlen(debugbuf), " %02x", p[t]);
		sprintf(debugbuf+strlen(debugbuf), " %02x",
		p[t]);
		#endif
		d++ = p[t]; / write tx_buff */
		t = (t+1) & CMX_BUFF_MASK;

drivers/isdn/mISDN/dsp_core.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -558,7 +558,7 @@ tone_off:
		dsp->pipeline.inuse = 1;
		dsp_cmx_hardware(dsp->conf, dsp);
		ret = dsp_pipeline_build(&dsp->pipeline,
		len > 0 ? (char *)data : NULL);
		len > 0 ? data : NULL);
		dsp_cmx_hardware(dsp->conf, dsp);
		dsp_rx_off(dsp);
		}
		@@ -1176,8 +1176,8 @@ static int dsp_init(void)
		/* init conversion tables */
		dsp_audio_generate_law_tables();
		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_alaw_to_s32;
		dsp_audio_law_to_s32 = (dsp_options&DSP_OPT_ULAW) ?
		dsp_audio_ulaw_to_s32 : dsp_audio_alaw_to_s32;
		dsp_audio_generate_s2law_table();
		dsp_audio_generate_seven();
		dsp_audio_generate_mix_table();