mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
net/irda: remove trailing space in messages
Includes a minor consistency improvement between two related debug messages. Signed-off-by: Frans Pop <elendil@planet.nl> Cc: Samuel Ortiz <samuel@sortiz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
a570f095ea
commit
19299b34b4
3 changed files with 19 additions and 19 deletions
|
@ -753,18 +753,18 @@ static irqreturn_t ali_ircc_fir_interrupt(struct ali_ircc_cb *self)
|
|||
if(OldMessageCount > ((self->LineStatus+1) & 0x07))
|
||||
{
|
||||
self->rcvFramesOverflow = TRUE;
|
||||
IRDA_DEBUG(1, "%s(), ******* self->rcvFramesOverflow = TRUE ******** \n", __func__);
|
||||
IRDA_DEBUG(1, "%s(), ******* self->rcvFramesOverflow = TRUE ********\n", __func__);
|
||||
}
|
||||
|
||||
if (ali_ircc_dma_receive_complete(self))
|
||||
{
|
||||
IRDA_DEBUG(1, "%s(), ******* receive complete ******** \n", __func__);
|
||||
IRDA_DEBUG(1, "%s(), ******* receive complete ********\n", __func__);
|
||||
|
||||
self->ier = IER_EOM;
|
||||
}
|
||||
else
|
||||
{
|
||||
IRDA_DEBUG(1, "%s(), ******* Not receive complete ******** \n", __func__);
|
||||
IRDA_DEBUG(1, "%s(), ******* Not receive complete ********\n", __func__);
|
||||
|
||||
self->ier = IER_EOM | IER_TIMER;
|
||||
}
|
||||
|
@ -777,7 +777,7 @@ static irqreturn_t ali_ircc_fir_interrupt(struct ali_ircc_cb *self)
|
|||
if(OldMessageCount > ((self->LineStatus+1) & 0x07))
|
||||
{
|
||||
self->rcvFramesOverflow = TRUE;
|
||||
IRDA_DEBUG(1, "%s(), ******* self->rcvFramesOverflow = TRUE ******* \n", __func__);
|
||||
IRDA_DEBUG(1, "%s(), ******* self->rcvFramesOverflow = TRUE *******\n", __func__);
|
||||
}
|
||||
/* Disable Timer */
|
||||
switch_bank(iobase, BANK1);
|
||||
|
@ -942,7 +942,7 @@ static void ali_ircc_sir_write_wakeup(struct ali_ircc_cb *self)
|
|||
// benjamin 2000/11/10 06:32PM
|
||||
if (self->io.speed > 115200)
|
||||
{
|
||||
IRDA_DEBUG(2, "%s(), ali_ircc_change_speed from UART_LSR_TEMT \n", __func__ );
|
||||
IRDA_DEBUG(2, "%s(), ali_ircc_change_speed from UART_LSR_TEMT\n", __func__ );
|
||||
|
||||
self->ier = IER_EOM;
|
||||
// SetCOMInterrupts(self, TRUE);
|
||||
|
@ -970,7 +970,7 @@ static void ali_ircc_change_speed(struct ali_ircc_cb *self, __u32 baud)
|
|||
|
||||
IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __func__ );
|
||||
|
||||
IRDA_DEBUG(2, "%s(), setting speed = %d \n", __func__ , baud);
|
||||
IRDA_DEBUG(2, "%s(), setting speed = %d\n", __func__ , baud);
|
||||
|
||||
/* This function *must* be called with irq off and spin-lock.
|
||||
* - Jean II */
|
||||
|
@ -1500,7 +1500,7 @@ static netdev_tx_t ali_ircc_fir_hard_xmit(struct sk_buff *skb,
|
|||
diff = self->now.tv_usec - self->stamp.tv_usec;
|
||||
/* self->stamp is set from ali_ircc_dma_receive_complete() */
|
||||
|
||||
IRDA_DEBUG(1, "%s(), ******* diff = %d ******* \n", __func__ , diff);
|
||||
IRDA_DEBUG(1, "%s(), ******* diff = %d *******\n", __func__ , diff);
|
||||
|
||||
if (diff < 0)
|
||||
diff += 1000000;
|
||||
|
@ -1641,7 +1641,7 @@ static void ali_ircc_dma_xmit(struct ali_ircc_cb *self)
|
|||
tmp = inb(iobase+FIR_LCR_B);
|
||||
tmp &= ~0x20; // Disable SIP
|
||||
outb(((unsigned char)(tmp & 0x3f) | LCR_B_TX_MODE) & ~LCR_B_BW, iobase+FIR_LCR_B);
|
||||
IRDA_DEBUG(1, "%s(), ******* Change to TX mode: FIR_LCR_B = 0x%x ******* \n", __func__ , inb(iobase+FIR_LCR_B));
|
||||
IRDA_DEBUG(1, "%s(), *** Change to TX mode: FIR_LCR_B = 0x%x ***\n", __func__ , inb(iobase+FIR_LCR_B));
|
||||
|
||||
outb(0, iobase+FIR_LSR);
|
||||
|
||||
|
@ -1768,7 +1768,7 @@ static int ali_ircc_dma_receive(struct ali_ircc_cb *self)
|
|||
//switch_bank(iobase, BANK0);
|
||||
tmp = inb(iobase+FIR_LCR_B);
|
||||
outb((unsigned char)(tmp &0x3f) | LCR_B_RX_MODE | LCR_B_BW , iobase + FIR_LCR_B); // 2000/12/1 05:16PM
|
||||
IRDA_DEBUG(1, "%s(), *** Change To RX mode: FIR_LCR_B = 0x%x *** \n", __func__ , inb(iobase+FIR_LCR_B));
|
||||
IRDA_DEBUG(1, "%s(), *** Change To RX mode: FIR_LCR_B = 0x%x ***\n", __func__ , inb(iobase+FIR_LCR_B));
|
||||
|
||||
/* Set Rx Threshold */
|
||||
switch_bank(iobase, BANK1);
|
||||
|
@ -1840,7 +1840,7 @@ static int ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)
|
|||
/* Check for errors */
|
||||
if ((status & 0xd8) || self->rcvFramesOverflow || (len==0))
|
||||
{
|
||||
IRDA_DEBUG(0,"%s(), ************* RX Errors ************ \n", __func__ );
|
||||
IRDA_DEBUG(0,"%s(), ************* RX Errors ************\n", __func__ );
|
||||
|
||||
/* Skip frame */
|
||||
self->netdev->stats.rx_errors++;
|
||||
|
@ -1850,29 +1850,29 @@ static int ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)
|
|||
if (status & LSR_FIFO_UR)
|
||||
{
|
||||
self->netdev->stats.rx_frame_errors++;
|
||||
IRDA_DEBUG(0,"%s(), ************* FIFO Errors ************ \n", __func__ );
|
||||
IRDA_DEBUG(0,"%s(), ************* FIFO Errors ************\n", __func__ );
|
||||
}
|
||||
if (status & LSR_FRAME_ERROR)
|
||||
{
|
||||
self->netdev->stats.rx_frame_errors++;
|
||||
IRDA_DEBUG(0,"%s(), ************* FRAME Errors ************ \n", __func__ );
|
||||
IRDA_DEBUG(0,"%s(), ************* FRAME Errors ************\n", __func__ );
|
||||
}
|
||||
|
||||
if (status & LSR_CRC_ERROR)
|
||||
{
|
||||
self->netdev->stats.rx_crc_errors++;
|
||||
IRDA_DEBUG(0,"%s(), ************* CRC Errors ************ \n", __func__ );
|
||||
IRDA_DEBUG(0,"%s(), ************* CRC Errors ************\n", __func__ );
|
||||
}
|
||||
|
||||
if(self->rcvFramesOverflow)
|
||||
{
|
||||
self->netdev->stats.rx_frame_errors++;
|
||||
IRDA_DEBUG(0,"%s(), ************* Overran DMA buffer ************ \n", __func__ );
|
||||
IRDA_DEBUG(0,"%s(), ************* Overran DMA buffer ************\n", __func__ );
|
||||
}
|
||||
if(len == 0)
|
||||
{
|
||||
self->netdev->stats.rx_frame_errors++;
|
||||
IRDA_DEBUG(0,"%s(), ********** Receive Frame Size = 0 ********* \n", __func__ );
|
||||
IRDA_DEBUG(0,"%s(), ********** Receive Frame Size = 0 *********\n", __func__ );
|
||||
}
|
||||
}
|
||||
else
|
||||
|
@ -1884,7 +1884,7 @@ static int ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)
|
|||
val = inb(iobase+FIR_BSR);
|
||||
if ((val& BSR_FIFO_NOT_EMPTY)== 0x80)
|
||||
{
|
||||
IRDA_DEBUG(0, "%s(), ************* BSR_FIFO_NOT_EMPTY ************ \n", __func__ );
|
||||
IRDA_DEBUG(0, "%s(), ************* BSR_FIFO_NOT_EMPTY ************\n", __func__ );
|
||||
|
||||
/* Put this entry back in fifo */
|
||||
st_fifo->head--;
|
||||
|
|
|
@ -839,7 +839,7 @@ static void irda_usb_receive(struct urb *urb)
|
|||
/* Usually precursor to a hot-unplug on OHCI. */
|
||||
default:
|
||||
self->netdev->stats.rx_errors++;
|
||||
IRDA_DEBUG(0, "%s(), RX status %d, transfer_flags 0x%04X \n", __func__, urb->status, urb->transfer_flags);
|
||||
IRDA_DEBUG(0, "%s(), RX status %d, transfer_flags 0x%04X\n", __func__, urb->status, urb->transfer_flags);
|
||||
break;
|
||||
}
|
||||
/* If we received an error, we don't want to resubmit the
|
||||
|
|
|
@ -1742,7 +1742,7 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
|
|||
vlsi_irda_dev_t *idev;
|
||||
|
||||
if (!ndev) {
|
||||
IRDA_ERROR("%s - %s: no netdevice \n",
|
||||
IRDA_ERROR("%s - %s: no netdevice\n",
|
||||
__func__, pci_name(pdev));
|
||||
return 0;
|
||||
}
|
||||
|
@ -1781,7 +1781,7 @@ static int vlsi_irda_resume(struct pci_dev *pdev)
|
|||
vlsi_irda_dev_t *idev;
|
||||
|
||||
if (!ndev) {
|
||||
IRDA_ERROR("%s - %s: no netdevice \n",
|
||||
IRDA_ERROR("%s - %s: no netdevice\n",
|
||||
__func__, pci_name(pdev));
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue