diff options
author | Frans Pop <elendil@planet.nl> | 2010-03-24 03:57:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-24 17:01:55 -0400 |
commit | 19299b34b42f4d37be2ce9b411664f37ca10ff61 (patch) | |
tree | 5de1ef0ed55351bd15a1d0cfb424b8496d8ae1e2 /drivers/net/irda/ali-ircc.c | |
parent | a570f095eac34b7439eed2df6728381708c55bdc (diff) |
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>
Diffstat (limited to 'drivers/net/irda/ali-ircc.c')
-rw-r--r-- | drivers/net/irda/ali-ircc.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index 12c7b006f767..a32c97e6b39d 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c | |||
@@ -753,18 +753,18 @@ static irqreturn_t ali_ircc_fir_interrupt(struct ali_ircc_cb *self) | |||
753 | if(OldMessageCount > ((self->LineStatus+1) & 0x07)) | 753 | if(OldMessageCount > ((self->LineStatus+1) & 0x07)) |
754 | { | 754 | { |
755 | self->rcvFramesOverflow = TRUE; | 755 | self->rcvFramesOverflow = TRUE; |
756 | IRDA_DEBUG(1, "%s(), ******* self->rcvFramesOverflow = TRUE ******** \n", __func__); | 756 | IRDA_DEBUG(1, "%s(), ******* self->rcvFramesOverflow = TRUE ********\n", __func__); |
757 | } | 757 | } |
758 | 758 | ||
759 | if (ali_ircc_dma_receive_complete(self)) | 759 | if (ali_ircc_dma_receive_complete(self)) |
760 | { | 760 | { |
761 | IRDA_DEBUG(1, "%s(), ******* receive complete ******** \n", __func__); | 761 | IRDA_DEBUG(1, "%s(), ******* receive complete ********\n", __func__); |
762 | 762 | ||
763 | self->ier = IER_EOM; | 763 | self->ier = IER_EOM; |
764 | } | 764 | } |
765 | else | 765 | else |
766 | { | 766 | { |
767 | IRDA_DEBUG(1, "%s(), ******* Not receive complete ******** \n", __func__); | 767 | IRDA_DEBUG(1, "%s(), ******* Not receive complete ********\n", __func__); |
768 | 768 | ||
769 | self->ier = IER_EOM | IER_TIMER; | 769 | self->ier = IER_EOM | IER_TIMER; |
770 | } | 770 | } |
@@ -777,7 +777,7 @@ static irqreturn_t ali_ircc_fir_interrupt(struct ali_ircc_cb *self) | |||
777 | if(OldMessageCount > ((self->LineStatus+1) & 0x07)) | 777 | if(OldMessageCount > ((self->LineStatus+1) & 0x07)) |
778 | { | 778 | { |
779 | self->rcvFramesOverflow = TRUE; | 779 | self->rcvFramesOverflow = TRUE; |
780 | IRDA_DEBUG(1, "%s(), ******* self->rcvFramesOverflow = TRUE ******* \n", __func__); | 780 | IRDA_DEBUG(1, "%s(), ******* self->rcvFramesOverflow = TRUE *******\n", __func__); |
781 | } | 781 | } |
782 | /* Disable Timer */ | 782 | /* Disable Timer */ |
783 | switch_bank(iobase, BANK1); | 783 | switch_bank(iobase, BANK1); |
@@ -942,7 +942,7 @@ static void ali_ircc_sir_write_wakeup(struct ali_ircc_cb *self) | |||
942 | // benjamin 2000/11/10 06:32PM | 942 | // benjamin 2000/11/10 06:32PM |
943 | if (self->io.speed > 115200) | 943 | if (self->io.speed > 115200) |
944 | { | 944 | { |
945 | IRDA_DEBUG(2, "%s(), ali_ircc_change_speed from UART_LSR_TEMT \n", __func__ ); | 945 | IRDA_DEBUG(2, "%s(), ali_ircc_change_speed from UART_LSR_TEMT\n", __func__ ); |
946 | 946 | ||
947 | self->ier = IER_EOM; | 947 | self->ier = IER_EOM; |
948 | // SetCOMInterrupts(self, TRUE); | 948 | // SetCOMInterrupts(self, TRUE); |
@@ -970,7 +970,7 @@ static void ali_ircc_change_speed(struct ali_ircc_cb *self, __u32 baud) | |||
970 | 970 | ||
971 | IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __func__ ); | 971 | IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __func__ ); |
972 | 972 | ||
973 | IRDA_DEBUG(2, "%s(), setting speed = %d \n", __func__ , baud); | 973 | IRDA_DEBUG(2, "%s(), setting speed = %d\n", __func__ , baud); |
974 | 974 | ||
975 | /* This function *must* be called with irq off and spin-lock. | 975 | /* This function *must* be called with irq off and spin-lock. |
976 | * - Jean II */ | 976 | * - Jean II */ |
@@ -1500,7 +1500,7 @@ static netdev_tx_t ali_ircc_fir_hard_xmit(struct sk_buff *skb, | |||
1500 | diff = self->now.tv_usec - self->stamp.tv_usec; | 1500 | diff = self->now.tv_usec - self->stamp.tv_usec; |
1501 | /* self->stamp is set from ali_ircc_dma_receive_complete() */ | 1501 | /* self->stamp is set from ali_ircc_dma_receive_complete() */ |
1502 | 1502 | ||
1503 | IRDA_DEBUG(1, "%s(), ******* diff = %d ******* \n", __func__ , diff); | 1503 | IRDA_DEBUG(1, "%s(), ******* diff = %d *******\n", __func__ , diff); |
1504 | 1504 | ||
1505 | if (diff < 0) | 1505 | if (diff < 0) |
1506 | diff += 1000000; | 1506 | diff += 1000000; |
@@ -1641,7 +1641,7 @@ static void ali_ircc_dma_xmit(struct ali_ircc_cb *self) | |||
1641 | tmp = inb(iobase+FIR_LCR_B); | 1641 | tmp = inb(iobase+FIR_LCR_B); |
1642 | tmp &= ~0x20; // Disable SIP | 1642 | tmp &= ~0x20; // Disable SIP |
1643 | outb(((unsigned char)(tmp & 0x3f) | LCR_B_TX_MODE) & ~LCR_B_BW, iobase+FIR_LCR_B); | 1643 | outb(((unsigned char)(tmp & 0x3f) | LCR_B_TX_MODE) & ~LCR_B_BW, iobase+FIR_LCR_B); |
1644 | IRDA_DEBUG(1, "%s(), ******* Change to TX mode: FIR_LCR_B = 0x%x ******* \n", __func__ , inb(iobase+FIR_LCR_B)); | 1644 | IRDA_DEBUG(1, "%s(), *** Change to TX mode: FIR_LCR_B = 0x%x ***\n", __func__ , inb(iobase+FIR_LCR_B)); |
1645 | 1645 | ||
1646 | outb(0, iobase+FIR_LSR); | 1646 | outb(0, iobase+FIR_LSR); |
1647 | 1647 | ||
@@ -1768,7 +1768,7 @@ static int ali_ircc_dma_receive(struct ali_ircc_cb *self) | |||
1768 | //switch_bank(iobase, BANK0); | 1768 | //switch_bank(iobase, BANK0); |
1769 | tmp = inb(iobase+FIR_LCR_B); | 1769 | tmp = inb(iobase+FIR_LCR_B); |
1770 | outb((unsigned char)(tmp &0x3f) | LCR_B_RX_MODE | LCR_B_BW , iobase + FIR_LCR_B); // 2000/12/1 05:16PM | 1770 | outb((unsigned char)(tmp &0x3f) | LCR_B_RX_MODE | LCR_B_BW , iobase + FIR_LCR_B); // 2000/12/1 05:16PM |
1771 | IRDA_DEBUG(1, "%s(), *** Change To RX mode: FIR_LCR_B = 0x%x *** \n", __func__ , inb(iobase+FIR_LCR_B)); | 1771 | IRDA_DEBUG(1, "%s(), *** Change To RX mode: FIR_LCR_B = 0x%x ***\n", __func__ , inb(iobase+FIR_LCR_B)); |
1772 | 1772 | ||
1773 | /* Set Rx Threshold */ | 1773 | /* Set Rx Threshold */ |
1774 | switch_bank(iobase, BANK1); | 1774 | switch_bank(iobase, BANK1); |
@@ -1840,7 +1840,7 @@ static int ali_ircc_dma_receive_complete(struct ali_ircc_cb *self) | |||
1840 | /* Check for errors */ | 1840 | /* Check for errors */ |
1841 | if ((status & 0xd8) || self->rcvFramesOverflow || (len==0)) | 1841 | if ((status & 0xd8) || self->rcvFramesOverflow || (len==0)) |
1842 | { | 1842 | { |
1843 | IRDA_DEBUG(0,"%s(), ************* RX Errors ************ \n", __func__ ); | 1843 | IRDA_DEBUG(0,"%s(), ************* RX Errors ************\n", __func__ ); |
1844 | 1844 | ||
1845 | /* Skip frame */ | 1845 | /* Skip frame */ |
1846 | self->netdev->stats.rx_errors++; | 1846 | self->netdev->stats.rx_errors++; |
@@ -1850,29 +1850,29 @@ static int ali_ircc_dma_receive_complete(struct ali_ircc_cb *self) | |||
1850 | if (status & LSR_FIFO_UR) | 1850 | if (status & LSR_FIFO_UR) |
1851 | { | 1851 | { |
1852 | self->netdev->stats.rx_frame_errors++; | 1852 | self->netdev->stats.rx_frame_errors++; |
1853 | IRDA_DEBUG(0,"%s(), ************* FIFO Errors ************ \n", __func__ ); | 1853 | IRDA_DEBUG(0,"%s(), ************* FIFO Errors ************\n", __func__ ); |
1854 | } | 1854 | } |
1855 | if (status & LSR_FRAME_ERROR) | 1855 | if (status & LSR_FRAME_ERROR) |
1856 | { | 1856 | { |
1857 | self->netdev->stats.rx_frame_errors++; | 1857 | self->netdev->stats.rx_frame_errors++; |
1858 | IRDA_DEBUG(0,"%s(), ************* FRAME Errors ************ \n", __func__ ); | 1858 | IRDA_DEBUG(0,"%s(), ************* FRAME Errors ************\n", __func__ ); |
1859 | } | 1859 | } |
1860 | 1860 | ||
1861 | if (status & LSR_CRC_ERROR) | 1861 | if (status & LSR_CRC_ERROR) |
1862 | { | 1862 | { |
1863 | self->netdev->stats.rx_crc_errors++; | 1863 | self->netdev->stats.rx_crc_errors++; |
1864 | IRDA_DEBUG(0,"%s(), ************* CRC Errors ************ \n", __func__ ); | 1864 | IRDA_DEBUG(0,"%s(), ************* CRC Errors ************\n", __func__ ); |
1865 | } | 1865 | } |
1866 | 1866 | ||
1867 | if(self->rcvFramesOverflow) | 1867 | if(self->rcvFramesOverflow) |
1868 | { | 1868 | { |
1869 | self->netdev->stats.rx_frame_errors++; | 1869 | self->netdev->stats.rx_frame_errors++; |
1870 | IRDA_DEBUG(0,"%s(), ************* Overran DMA buffer ************ \n", __func__ ); | 1870 | IRDA_DEBUG(0,"%s(), ************* Overran DMA buffer ************\n", __func__ ); |
1871 | } | 1871 | } |
1872 | if(len == 0) | 1872 | if(len == 0) |
1873 | { | 1873 | { |
1874 | self->netdev->stats.rx_frame_errors++; | 1874 | self->netdev->stats.rx_frame_errors++; |
1875 | IRDA_DEBUG(0,"%s(), ********** Receive Frame Size = 0 ********* \n", __func__ ); | 1875 | IRDA_DEBUG(0,"%s(), ********** Receive Frame Size = 0 *********\n", __func__ ); |
1876 | } | 1876 | } |
1877 | } | 1877 | } |
1878 | else | 1878 | else |
@@ -1884,7 +1884,7 @@ static int ali_ircc_dma_receive_complete(struct ali_ircc_cb *self) | |||
1884 | val = inb(iobase+FIR_BSR); | 1884 | val = inb(iobase+FIR_BSR); |
1885 | if ((val& BSR_FIFO_NOT_EMPTY)== 0x80) | 1885 | if ((val& BSR_FIFO_NOT_EMPTY)== 0x80) |
1886 | { | 1886 | { |
1887 | IRDA_DEBUG(0, "%s(), ************* BSR_FIFO_NOT_EMPTY ************ \n", __func__ ); | 1887 | IRDA_DEBUG(0, "%s(), ************* BSR_FIFO_NOT_EMPTY ************\n", __func__ ); |
1888 | 1888 | ||
1889 | /* Put this entry back in fifo */ | 1889 | /* Put this entry back in fifo */ |
1890 | st_fifo->head--; | 1890 | st_fifo->head--; |