Skip to content

L
linux
Commit 014e4668 authored by Frans Pop's avatar Frans Pop Committed by David S. Miller
Browse files
Options

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: default avatarFrans Pop <elendil@planet.nl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 84d57bd6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 106 deletions
drivers/net/tokenring/3c359.c
View file @ 014e4668
This diff is collapsed.
drivers/net/tokenring/lanstreamer.c
View file @ 014e4668
...@@ -357,7 +357,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev, ...@@ -357,7 +357,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
pcr |= PCI_COMMAND_SERR; pcr |= PCI_COMMAND_SERR;
pci_write_config_word (pdev, PCI_COMMAND, pcr); pci_write_config_word (pdev, PCI_COMMAND, pcr);
printk("%s \n", version); printk("%s\n", version);
printk("%s: %s. I/O at %hx, MMIO at %p, using irq %d\n",dev->name, printk("%s: %s. I/O at %hx, MMIO at %p, using irq %d\n",dev->name,
streamer_priv->streamer_card_name, streamer_priv->streamer_card_name,
(unsigned int) dev->base_addr, (unsigned int) dev->base_addr,
...@@ -650,7 +650,7 @@ static int streamer_open(struct net_device *dev) ...@@ -650,7 +650,7 @@ static int streamer_open(struct net_device *dev)
#if STREAMER_DEBUG #if STREAMER_DEBUG
writew(readw(streamer_mmio + LAPWWO), writew(readw(streamer_mmio + LAPWWO),
streamer_mmio + LAPA); streamer_mmio + LAPA);
printk("srb open request: \n"); printk("srb open request:\n");
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
printk("%x:", ntohs(readw(streamer_mmio + LAPDINC))); printk("%x:", ntohs(readw(streamer_mmio + LAPDINC)));
} }
...@@ -700,7 +700,7 @@ static int streamer_open(struct net_device *dev) ...@@ -700,7 +700,7 @@ static int streamer_open(struct net_device *dev)
if (srb_word != 0) { if (srb_word != 0) {
if (srb_word == 0x07) { if (srb_word == 0x07) {
if (!streamer_priv->streamer_ring_speed && open_finished) { /* Autosense , first time around */ if (!streamer_priv->streamer_ring_speed && open_finished) { /* Autosense , first time around */
printk(KERN_WARNING "%s: Retrying at different ring speed \n", printk(KERN_WARNING "%s: Retrying at different ring speed\n",
dev->name); dev->name);
open_finished = 0; open_finished = 0;
} else { } else {
...@@ -716,7 +716,7 @@ static int streamer_open(struct net_device *dev) ...@@ -716,7 +716,7 @@ static int streamer_open(struct net_device *dev)
((error_code & 0x0f) == 0x0d)) ((error_code & 0x0f) == 0x0d))
{ {
printk(KERN_WARNING "%s: Tried to autosense ring speed with no monitors present\n", dev->name); 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);
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
return -EIO; return -EIO;
} }
...@@ -922,7 +922,7 @@ static void streamer_rx(struct net_device *dev) ...@@ -922,7 +922,7 @@ static void streamer_rx(struct net_device *dev)
if (rx_desc->status & 0x7E830000) { /* errors */ if (rx_desc->status & 0x7E830000) { /* errors */
if (streamer_priv->streamer_message_level) { if (streamer_priv->streamer_message_level) {
printk(KERN_WARNING "%s: Rx Error %x \n", printk(KERN_WARNING "%s: Rx Error %x\n",
dev->name, rx_desc->status); dev->name, rx_desc->status);
} }
} else { /* received without errors */ } else { /* received without errors */
...@@ -935,7 +935,7 @@ static void streamer_rx(struct net_device *dev) ...@@ -935,7 +935,7 @@ static void streamer_rx(struct net_device *dev)
if (skb == NULL) 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++; dev->stats.rx_dropped++;
} else { /* we allocated an skb OK */ } else { /* we allocated an skb OK */
if (buffer_cnt == 1) { if (buffer_cnt == 1) {
...@@ -1363,7 +1363,7 @@ static void streamer_srb_bh(struct net_device *dev) ...@@ -1363,7 +1363,7 @@ static void streamer_srb_bh(struct net_device *dev)
case 0x00: case 0x00:
break; break;
case 0x01: case 0x01:
printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name); printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
break; break;
case 0x04: case 0x04:
printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name); printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
...@@ -1391,13 +1391,13 @@ static void streamer_srb_bh(struct net_device *dev) ...@@ -1391,13 +1391,13 @@ static void streamer_srb_bh(struct net_device *dev)
case 0x00: case 0x00:
break; break;
case 0x01: case 0x01:
printk(KERN_WARNING "%s: Unrecognized srb command \n", dev->name); printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
break; break;
case 0x04: case 0x04:
printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name); printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
break; break;
case 0x39: /* Must deal with this if individual multicast addresses used */ 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; break;
default: default:
break; break;
...@@ -1413,10 +1413,10 @@ static void streamer_srb_bh(struct net_device *dev) ...@@ -1413,10 +1413,10 @@ static void streamer_srb_bh(struct net_device *dev)
switch (srb_word) { switch (srb_word) {
case 0x00: case 0x00:
if (streamer_priv->streamer_message_level) if (streamer_priv->streamer_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; break;
case 0x01: case 0x01:
printk(KERN_WARNING "%s: Unrecognized srb command \n", dev->name); printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
break; break;
case 0x04: case 0x04:
printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name); printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
...@@ -1447,7 +1447,7 @@ static void streamer_srb_bh(struct net_device *dev) ...@@ -1447,7 +1447,7 @@ static void streamer_srb_bh(struct net_device *dev)
} }
break; break;
case 0x01: case 0x01:
printk(KERN_WARNING "%s: Unrecognized srb command \n", dev->name); printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
break; break;
case 0x04: case 0x04:
printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name); printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
...@@ -1466,7 +1466,7 @@ static void streamer_srb_bh(struct net_device *dev) ...@@ -1466,7 +1466,7 @@ static void streamer_srb_bh(struct net_device *dev)
printk(KERN_INFO "%s: Read Source Routing Counters issued\n", dev->name); printk(KERN_INFO "%s: Read Source Routing Counters issued\n", dev->name);
break; break;
case 0x01: case 0x01:
printk(KERN_WARNING "%s: Unrecognized srb command \n", dev->name); printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
break; break;
case 0x04: case 0x04:
printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name); printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
...@@ -1555,7 +1555,7 @@ static void streamer_arb_cmd(struct net_device *dev) ...@@ -1555,7 +1555,7 @@ static void streamer_arb_cmd(struct net_device *dev)
(streamer_mmio + LAPDINC))); (streamer_mmio + LAPDINC)));
} }
printk("next %04x, fs %02x, len %04x \n", next, printk("next %04x, fs %02x, len %04x\n", next,
status, len); status, len);
} }
#endif #endif
...@@ -1592,7 +1592,7 @@ static void streamer_arb_cmd(struct net_device *dev) ...@@ -1592,7 +1592,7 @@ static void streamer_arb_cmd(struct net_device *dev)
mac_frame->protocol = tr_type_trans(mac_frame, dev); mac_frame->protocol = tr_type_trans(mac_frame, dev);
#if STREAMER_NETWORK_MONITOR #if STREAMER_NETWORK_MONITOR
printk(KERN_WARNING "%s: Received MAC Frame, details: \n", printk(KERN_WARNING "%s: Received MAC Frame, details:\n",
dev->name); dev->name);
mac_hdr = tr_hdr(mac_frame); mac_hdr = tr_hdr(mac_frame);
printk(KERN_WARNING printk(KERN_WARNING
...@@ -1668,15 +1668,15 @@ static void streamer_arb_cmd(struct net_device *dev) ...@@ -1668,15 +1668,15 @@ static void streamer_arb_cmd(struct net_device *dev)
/* If serious error */ /* If serious error */
if (streamer_priv->streamer_message_level) { if (streamer_priv->streamer_message_level) {
if (lan_status_diff & LSC_SIG_LOSS) 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) 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) 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) if (lan_status_diff & LSC_TRAN_BCN)
printk(KERN_INFO "%s: We are tranmitting the beacon, aaah\n", dev->name); printk(KERN_INFO "%s: We are tranmitting the beacon, aaah\n", dev->name);
if (lan_status_diff & LSC_SS) 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) if (lan_status_diff & LSC_RING_REC)
printk(KERN_INFO "%s: Ring recovery ongoing\n", dev->name); printk(KERN_INFO "%s: Ring recovery ongoing\n", dev->name);
if (lan_status_diff & LSC_FDX_MODE) if (lan_status_diff & LSC_FDX_MODE)
...@@ -1685,7 +1685,7 @@ static void streamer_arb_cmd(struct net_device *dev) ...@@ -1685,7 +1685,7 @@ static void streamer_arb_cmd(struct net_device *dev)
if (lan_status_diff & LSC_CO) { if (lan_status_diff & LSC_CO) {
if (streamer_priv->streamer_message_level) if (streamer_priv->streamer_message_level)
printk(KERN_INFO "%s: Counter Overflow \n", dev->name); printk(KERN_INFO "%s: Counter Overflow\n", dev->name);
/* Issue READ.LOG command */ /* Issue READ.LOG command */
...@@ -1715,7 +1715,7 @@ static void streamer_arb_cmd(struct net_device *dev) ...@@ -1715,7 +1715,7 @@ static void streamer_arb_cmd(struct net_device *dev)
streamer_priv->streamer_lan_status = lan_status; streamer_priv->streamer_lan_status = lan_status;
} /* Lan.change.status */ } /* Lan.change.status */
else else
printk(KERN_WARNING "%s: Unknown arb command \n", dev->name); printk(KERN_WARNING "%s: Unknown arb command\n", dev->name);
} }
static void streamer_asb_bh(struct net_device *dev) static void streamer_asb_bh(struct net_device *dev)
...@@ -1746,10 +1746,10 @@ static void streamer_asb_bh(struct net_device *dev) ...@@ -1746,10 +1746,10 @@ static void streamer_asb_bh(struct net_device *dev)
rc=ntohs(readw(streamer_mmio+LAPD)) >> 8; rc=ntohs(readw(streamer_mmio+LAPD)) >> 8;
switch (rc) { switch (rc) {
case 0x01: case 0x01:
printk(KERN_WARNING "%s: Unrecognized command code \n", dev->name); printk(KERN_WARNING "%s: Unrecognized command code\n", dev->name);
break; break;
case 0x26: case 0x26:
printk(KERN_WARNING "%s: Unrecognized buffer address \n", dev->name); printk(KERN_WARNING "%s: Unrecognized buffer address\n", dev->name);
break; break;
case 0xFF: case 0xFF:
/* Valid response, everything should be ok again */ /* Valid response, everything should be ok again */
......
drivers/net/tokenring/olympic.c
View file @ 014e4668
This diff is collapsed.
drivers/net/tokenring/tms380tr.c
View file @ 014e4668
...@@ -1391,7 +1391,7 @@ static int tms380tr_bringup_diags(struct net_device *dev) ...@@ -1391,7 +1391,7 @@ static int tms380tr_bringup_diags(struct net_device *dev)
Status &= STS_MASK; Status &= STS_MASK;
if(tms380tr_debug > 3) if(tms380tr_debug > 3)
printk(KERN_DEBUG " %04X \n", Status); printk(KERN_DEBUG " %04X\n", Status);
/* BUD successfully completed */ /* BUD successfully completed */
if(Status == STS_INITIALIZE) if(Status == STS_INITIALIZE)
return (1); return (1);
...@@ -1847,7 +1847,7 @@ static void tms380tr_chk_irq(struct net_device *dev) ...@@ -1847,7 +1847,7 @@ static void tms380tr_chk_irq(struct net_device *dev)
break; break;
case DMA_WRITE_ABORT: case DMA_WRITE_ABORT:
printk(KERN_INFO "%s: DMA write operation aborted: \n", printk(KERN_INFO "%s: DMA write operation aborted:\n",
dev->name); dev->name);
switch (AdapterCheckBlock[1]) switch (AdapterCheckBlock[1])
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7