net/tokenring: remove trailing space in messages

Trailing spaces in files in /proc for lanstreamer.c and olympic.c
have been left as they are.

Signed-off-by: Frans Pop <elendil@planet.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 31 insertions, 31 deletions

diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index 3a25e0434ae2..3decaf4b6cf2 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -302,7 +302,7 @@ static int olympic_init(struct net_device *dev)
         olympic_priv=netdev_priv(dev);
         olympic_mmio=olympic_priv->olympic_mmio;
 
-        printk("%s \n", version);
+        printk("%s\n", version);
         printk("%s. I/O at %hx, MMIO at %p, LAP at %p, using irq %d\n", olympic_priv->olympic_card_name, (unsigned int) dev->base_addr,olympic_priv->olympic_mmio, olympic_priv->olympic_lap, dev->irq);
 
         writel(readl(olympic_mmio+BCTL) | BCTL_SOFTRESET,olympic_mmio+BCTL);
@@ -468,7 +468,7 @@ static int olympic_open(struct net_device *dev)
 #if OLYMPIC_DEBUG
         printk("LAPWWO: %x, LAPA: %x\n",readw(olympic_mmio+LAPWWO), readl(olympic_mmio+LAPA));
         printk("SISR Mask = %04x\n", readl(olympic_mmio+SISR_MASK));
-        printk("Before the open command \n");
+        printk("Before the open command\n");
 #endif  
         do {
                 memset_io(init_srb,0,SRB_COMMAND_SIZE);
@@ -520,7 +520,7 @@ static int olympic_open(struct net_device *dev)
                                 break;
                         }
                         if (time_after(jiffies, t + 10*HZ)) {
-                                printk(KERN_WARNING "%s: SRB timed out. \n",dev->name) ; 
+                                printk(KERN_WARNING "%s: SRB timed out.\n",dev->name);
                                 olympic_priv->srb_queued=0;
                                 break ; 
                         } 
@@ -549,7 +549,7 @@ static int olympic_open(struct net_device *dev)
                         break;
                 case 0x07:
                         if (!olympic_priv->olympic_ring_speed && open_finished) { /* Autosense , first time around */
-                                printk(KERN_WARNING "%s: Retrying at different ring speed \n", dev->name); 
+                                printk(KERN_WARNING "%s: Retrying at different ring speed\n", dev->name);
                                 open_finished = 0 ;  
                                 continue;
                         }
@@ -558,7 +558,7 @@ static int olympic_open(struct net_device *dev)
 
                         if (!olympic_priv->olympic_ring_speed && ((err & 0x0f) == 0x0d)) { 
                                 printk(KERN_WARNING "%s: Tried to autosense ring speed with no monitors present\n",dev->name);
-                                printk(KERN_WARNING "%s: Please try again with a specified ring speed \n",dev->name);
+                                printk(KERN_WARNING "%s: Please try again with a specified ring speed\n",dev->name);
                         } else {
                                 printk(KERN_WARNING "%s: %s - %s\n", dev->name,
                                         open_maj_error[(err & 0xf0) >> 4],
@@ -759,7 +759,7 @@ static void olympic_rx(struct net_device *dev)
                 olympic_priv->rx_status_last_received++ ;
                 olympic_priv->rx_status_last_received &= (OLYMPIC_RX_RING_SIZE -1);
 #if OLYMPIC_DEBUG
-                printk("rx status: %x rx len: %x \n", le32_to_cpu(rx_status->status_buffercnt), le32_to_cpu(rx_status->fragmentcnt_framelen));
+                printk("rx status: %x rx len: %x\n", le32_to_cpu(rx_status->status_buffercnt), le32_to_cpu(rx_status->fragmentcnt_framelen));
 #endif
                 length = le32_to_cpu(rx_status->fragmentcnt_framelen) & 0xffff;
                 buffer_cnt = le32_to_cpu(rx_status->status_buffercnt) & 0xffff; 
@@ -774,15 +774,15 @@ static void olympic_rx(struct net_device *dev)
                         if (l_status_buffercnt & 0x3B000000) {
                                 if (olympic_priv->olympic_message_level) {
                                         if (l_status_buffercnt & (1<<29))  /* Rx Frame Truncated */
-                                                printk(KERN_WARNING "%s: Rx Frame Truncated \n",dev->name);
+                                                printk(KERN_WARNING "%s: Rx Frame Truncated\n",dev->name);
                                         if (l_status_buffercnt & (1<<28)) /*Rx receive overrun */
-                                                printk(KERN_WARNING "%s: Rx Frame Receive overrun \n",dev->name);
+                                                printk(KERN_WARNING "%s: Rx Frame Receive overrun\n",dev->name);
                                         if (l_status_buffercnt & (1<<27)) /* No receive buffers */
-                                                printk(KERN_WARNING "%s: No receive buffers \n",dev->name);
+                                                printk(KERN_WARNING "%s: No receive buffers\n",dev->name);
                                         if (l_status_buffercnt & (1<<25)) /* Receive frame error detect */
-                                                printk(KERN_WARNING "%s: Receive frame error detect \n",dev->name);
+                                                printk(KERN_WARNING "%s: Receive frame error detect\n",dev->name);
                                         if (l_status_buffercnt & (1<<24)) /* Received Error Detect */
-                                                printk(KERN_WARNING "%s: Received Error Detect \n",dev->name);
+                                                printk(KERN_WARNING "%s: Received Error Detect\n",dev->name);
                                 } 
                                 olympic_priv->rx_ring_last_received += i ; 
                                 olympic_priv->rx_ring_last_received &= (OLYMPIC_RX_RING_SIZE -1) ; 
@@ -796,7 +796,7 @@ static void olympic_rx(struct net_device *dev)
                                 }
 
                                 if (skb == NULL) {
-                                        printk(KERN_WARNING "%s: Not enough memory to copy packet to upper layers. \n",dev->name) ;
+                                        printk(KERN_WARNING "%s: Not enough memory to copy packet to upper layers.\n",dev->name) ;
                                         dev->stats.rx_dropped++;
                                         /* Update counters even though we don't transfer the frame */
                                         olympic_priv->rx_ring_last_received += i ; 
@@ -1101,7 +1101,7 @@ static int olympic_close(struct net_device *dev)
                 }
 
                 if (t == 0) { 
-                        printk(KERN_WARNING "%s: SRB timed out. May not be fatal. \n",dev->name) ; 
+                        printk(KERN_WARNING "%s: SRB timed out. May not be fatal.\n",dev->name);
                 } 
                 olympic_priv->srb_queued=0;
         }
@@ -1239,7 +1239,7 @@ static void olympic_srb_bh(struct net_device *dev)
                                 case 0x00:
                                         break ; 
                                 case 0x01:
-                                        printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name) ; 
+                                        printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
                                         break ;
                                 case 0x04:
                                         printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name); 
@@ -1266,13 +1266,13 @@ static void olympic_srb_bh(struct net_device *dev)
                                 case 0x00:
                                         break ; 
                                 case 0x01:
-                                        printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name) ; 
+                                        printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
                                         break ; 
                                 case 0x04:
                                         printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ; 
                                         break ; 
                                 case 0x39: /* Must deal with this if individual multicast addresses used */
-                                        printk(KERN_INFO "%s: Group address not found \n",dev->name); 
+                                        printk(KERN_INFO "%s: Group address not found\n",dev->name);
                                         break ;
                                 default:
                                         break ; 
@@ -1287,10 +1287,10 @@ static void olympic_srb_bh(struct net_device *dev)
                         switch (readb(srb+2)) { 
                                 case 0x00:
                                         if (olympic_priv->olympic_message_level)
-                                                printk(KERN_INFO "%s: Functional Address Mask Set \n",dev->name) ; 
+                                                printk(KERN_INFO "%s: Functional Address Mask Set\n",dev->name);
                                         break ;
                                 case 0x01:
-                                        printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name) ; 
+                                        printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
                                         break ; 
                                 case 0x04:
                                         printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ; 
@@ -1310,7 +1310,7 @@ static void olympic_srb_bh(struct net_device *dev)
                                                 printk(KERN_INFO "%s: Read Log issued\n",dev->name) ; 
                                         break ; 
                                 case 0x01:
-                                        printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name) ; 
+                                        printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
                                         break ; 
                                 case 0x04:
                                         printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ; 
@@ -1328,7 +1328,7 @@ static void olympic_srb_bh(struct net_device *dev)
                                                 printk(KERN_INFO "%s: Read Source Routing Counters issued\n",dev->name) ; 
                                         break ; 
                                 case 0x01:
-                                        printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name) ; 
+                                        printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
                                         break ; 
                                 case 0x04:
                                         printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ; 
@@ -1404,7 +1404,7 @@ static void olympic_arb_cmd(struct net_device *dev)
                         printk("Loc %d = %02x\n",i,readb(frame_data + i)); 
                 }
 
-                printk("next %04x, fs %02x, len %04x \n",readw(buf_ptr+offsetof(struct mac_receive_buffer,next)), readb(buf_ptr+offsetof(struct mac_receive_buffer,frame_status)), readw(buf_ptr+offsetof(struct mac_receive_buffer,buffer_length))); 
+                printk("next %04x, fs %02x, len %04x\n",readw(buf_ptr+offsetof(struct mac_receive_buffer,next)), readb(buf_ptr+offsetof(struct mac_receive_buffer,frame_status)), readw(buf_ptr+offsetof(struct mac_receive_buffer,buffer_length)));
 }
 #endif 
                 mac_frame = dev_alloc_skb(frame_len) ; 
@@ -1426,7 +1426,7 @@ static void olympic_arb_cmd(struct net_device *dev)
 
                 if (olympic_priv->olympic_network_monitor) { 
                         struct trh_hdr *mac_hdr;
-                        printk(KERN_WARNING "%s: Received MAC Frame, details: \n",dev->name);
+                        printk(KERN_WARNING "%s: Received MAC Frame, details:\n",dev->name);
                         mac_hdr = tr_hdr(mac_frame);
                         printk(KERN_WARNING "%s: MAC Frame Dest. Addr: %pM\n",
                                dev->name, mac_hdr->daddr);
@@ -1489,20 +1489,20 @@ drop_frame:
                         writel(readl(olympic_mmio+BCTL)&~(3<<13),olympic_mmio+BCTL);
                         netif_stop_queue(dev);
                         olympic_priv->srb = readw(olympic_priv->olympic_lap + LAPWWO) ; 
-                        printk(KERN_WARNING "%s: Adapter has been closed \n", dev->name) ; 
+                        printk(KERN_WARNING "%s: Adapter has been closed\n", dev->name);
                 } /* If serious error */
                 
                 if (olympic_priv->olympic_message_level) { 
                         if (lan_status_diff & LSC_SIG_LOSS) 
-                                        printk(KERN_WARNING "%s: No receive signal detected \n", dev->name) ; 
+                                        printk(KERN_WARNING "%s: No receive signal detected\n", dev->name);
                         if (lan_status_diff & LSC_HARD_ERR)
-                                        printk(KERN_INFO "%s: Beaconing \n",dev->name);
+                                        printk(KERN_INFO "%s: Beaconing\n",dev->name);
                         if (lan_status_diff & LSC_SOFT_ERR)
-                                        printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame \n",dev->name);
+                                        printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame\n",dev->name);
                         if (lan_status_diff & LSC_TRAN_BCN) 
                                         printk(KERN_INFO "%s: We are tranmitting the beacon, aaah\n",dev->name);
                         if (lan_status_diff & LSC_SS) 
-                                        printk(KERN_INFO "%s: Single Station on the ring \n", dev->name);
+                                        printk(KERN_INFO "%s: Single Station on the ring\n", dev->name);
                         if (lan_status_diff & LSC_RING_REC)
                                         printk(KERN_INFO "%s: Ring recovery ongoing\n",dev->name);
                         if (lan_status_diff & LSC_FDX_MODE)
@@ -1512,7 +1512,7 @@ drop_frame:
                 if (lan_status_diff & LSC_CO) { 
                                         
                                 if (olympic_priv->olympic_message_level) 
-                                        printk(KERN_INFO "%s: Counter Overflow \n", dev->name);
+                                        printk(KERN_INFO "%s: Counter Overflow\n", dev->name);
                                         
                                 /* Issue READ.LOG command */
 
@@ -1551,7 +1551,7 @@ drop_frame:
         
         }  /* Lan.change.status */
         else
-                printk(KERN_WARNING "%s: Unknown arb command \n", dev->name);
+                printk(KERN_WARNING "%s: Unknown arb command\n", dev->name);
 }
 
 static void olympic_asb_bh(struct net_device *dev) 
@@ -1578,10 +1578,10 @@ static void olympic_asb_bh(struct net_device *dev)
         if (olympic_priv->asb_queued == 2) { 
                 switch (readb(asb_block+2)) {
                         case 0x01:
-                                printk(KERN_WARNING "%s: Unrecognized command code \n", dev->name);
+                                printk(KERN_WARNING "%s: Unrecognized command code\n", dev->name);
                                 break ;
                         case 0x26:
-                                printk(KERN_WARNING "%s: Unrecognized buffer address \n", dev->name);
+                                printk(KERN_WARNING "%s: Unrecognized buffer address\n", dev->name);
                                 break ;
                         case 0xFF:
                                 /* Valid response, everything should be ok again */