diff options
author | Frans Pop <elendil@planet.nl> | 2010-03-24 03:57:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-24 17:10:07 -0400 |
commit | 014e46686eff2159bac0887465fed7662c379ad3 (patch) | |
tree | 14034000d602920a382f7efd4d8300a8c58c2c1c /drivers/net/tokenring/lanstreamer.c | |
parent | 84d57bd61866c06aee5658fabe43292a231a5992 (diff) |
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>
Diffstat (limited to 'drivers/net/tokenring/lanstreamer.c')
-rw-r--r-- | drivers/net/tokenring/lanstreamer.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index dd028fee9dc2..01c780f25e98 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
@@ -357,7 +357,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev, | |||
357 | pcr |= PCI_COMMAND_SERR; | 357 | pcr |= PCI_COMMAND_SERR; |
358 | pci_write_config_word (pdev, PCI_COMMAND, pcr); | 358 | pci_write_config_word (pdev, PCI_COMMAND, pcr); |
359 | 359 | ||
360 | printk("%s \n", version); | 360 | printk("%s\n", version); |
361 | printk("%s: %s. I/O at %hx, MMIO at %p, using irq %d\n",dev->name, | 361 | printk("%s: %s. I/O at %hx, MMIO at %p, using irq %d\n",dev->name, |
362 | streamer_priv->streamer_card_name, | 362 | streamer_priv->streamer_card_name, |
363 | (unsigned int) dev->base_addr, | 363 | (unsigned int) dev->base_addr, |
@@ -650,7 +650,7 @@ static int streamer_open(struct net_device *dev) | |||
650 | #if STREAMER_DEBUG | 650 | #if STREAMER_DEBUG |
651 | writew(readw(streamer_mmio + LAPWWO), | 651 | writew(readw(streamer_mmio + LAPWWO), |
652 | streamer_mmio + LAPA); | 652 | streamer_mmio + LAPA); |
653 | printk("srb open request: \n"); | 653 | printk("srb open request:\n"); |
654 | for (i = 0; i < 16; i++) { | 654 | for (i = 0; i < 16; i++) { |
655 | printk("%x:", ntohs(readw(streamer_mmio + LAPDINC))); | 655 | printk("%x:", ntohs(readw(streamer_mmio + LAPDINC))); |
656 | } | 656 | } |
@@ -700,7 +700,7 @@ static int streamer_open(struct net_device *dev) | |||
700 | if (srb_word != 0) { | 700 | if (srb_word != 0) { |
701 | if (srb_word == 0x07) { | 701 | if (srb_word == 0x07) { |
702 | if (!streamer_priv->streamer_ring_speed && open_finished) { /* Autosense , first time around */ | 702 | if (!streamer_priv->streamer_ring_speed && open_finished) { /* Autosense , first time around */ |
703 | printk(KERN_WARNING "%s: Retrying at different ring speed \n", | 703 | printk(KERN_WARNING "%s: Retrying at different ring speed\n", |
704 | dev->name); | 704 | dev->name); |
705 | open_finished = 0; | 705 | open_finished = 0; |
706 | } else { | 706 | } else { |
@@ -716,7 +716,7 @@ static int streamer_open(struct net_device *dev) | |||
716 | ((error_code & 0x0f) == 0x0d)) | 716 | ((error_code & 0x0f) == 0x0d)) |
717 | { | 717 | { |
718 | printk(KERN_WARNING "%s: Tried to autosense ring speed with no monitors present\n", dev->name); | 718 | printk(KERN_WARNING "%s: Tried to autosense ring speed with no monitors present\n", dev->name); |
719 | printk(KERN_WARNING "%s: Please try again with a specified ring speed \n", dev->name); | 719 | printk(KERN_WARNING "%s: Please try again with a specified ring speed\n", dev->name); |
720 | free_irq(dev->irq, dev); | 720 | free_irq(dev->irq, dev); |
721 | return -EIO; | 721 | return -EIO; |
722 | } | 722 | } |
@@ -922,7 +922,7 @@ static void streamer_rx(struct net_device *dev) | |||
922 | 922 | ||
923 | if (rx_desc->status & 0x7E830000) { /* errors */ | 923 | if (rx_desc->status & 0x7E830000) { /* errors */ |
924 | if (streamer_priv->streamer_message_level) { | 924 | if (streamer_priv->streamer_message_level) { |
925 | printk(KERN_WARNING "%s: Rx Error %x \n", | 925 | printk(KERN_WARNING "%s: Rx Error %x\n", |
926 | dev->name, rx_desc->status); | 926 | dev->name, rx_desc->status); |
927 | } | 927 | } |
928 | } else { /* received without errors */ | 928 | } else { /* received without errors */ |
@@ -935,7 +935,7 @@ static void streamer_rx(struct net_device *dev) | |||
935 | 935 | ||
936 | if (skb == NULL) | 936 | if (skb == NULL) |
937 | { | 937 | { |
938 | printk(KERN_WARNING "%s: Not enough memory to copy packet to upper layers. \n", dev->name); | 938 | printk(KERN_WARNING "%s: Not enough memory to copy packet to upper layers.\n", dev->name); |
939 | dev->stats.rx_dropped++; | 939 | dev->stats.rx_dropped++; |
940 | } else { /* we allocated an skb OK */ | 940 | } else { /* we allocated an skb OK */ |
941 | if (buffer_cnt == 1) { | 941 | if (buffer_cnt == 1) { |
@@ -1363,7 +1363,7 @@ static void streamer_srb_bh(struct net_device *dev) | |||
1363 | case 0x00: | 1363 | case 0x00: |
1364 | break; | 1364 | break; |
1365 | case 0x01: | 1365 | case 0x01: |
1366 | printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name); | 1366 | printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name); |
1367 | break; | 1367 | break; |
1368 | case 0x04: | 1368 | case 0x04: |
1369 | printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name); | 1369 | 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 | case 0x00: | 1391 | case 0x00: |
1392 | break; | 1392 | break; |
1393 | case 0x01: | 1393 | case 0x01: |
1394 | printk(KERN_WARNING "%s: Unrecognized srb command \n", dev->name); | 1394 | printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name); |
1395 | break; | 1395 | break; |
1396 | case 0x04: | 1396 | case 0x04: |
1397 | printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name); | 1397 | printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name); |
1398 | break; | 1398 | break; |
1399 | case 0x39: /* Must deal with this if individual multicast addresses used */ | 1399 | case 0x39: /* Must deal with this if individual multicast addresses used */ |
1400 | printk(KERN_INFO "%s: Group address not found \n", dev->name); | 1400 | printk(KERN_INFO "%s: Group address not found\n", dev->name); |
1401 | break; | 1401 | break; |
1402 | default: | 1402 | default: |
1403 | break; | 1403 | break; |
@@ -1413,10 +1413,10 @@ static void streamer_srb_bh(struct net_device *dev) | |||
1413 | switch (srb_word) { | 1413 | switch (srb_word) { |
1414 | case 0x00: | 1414 | case 0x00: |
1415 | if (streamer_priv->streamer_message_level) | 1415 | if (streamer_priv->streamer_message_level) |
1416 | printk(KERN_INFO "%s: Functional Address Mask Set \n", dev->name); | 1416 | printk(KERN_INFO "%s: Functional Address Mask Set\n", dev->name); |
1417 | break; | 1417 | break; |
1418 | case 0x01: | 1418 | case 0x01: |
1419 | printk(KERN_WARNING "%s: Unrecognized srb command \n", dev->name); | 1419 | printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name); |
1420 | break; | 1420 | break; |
1421 | case 0x04: | 1421 | case 0x04: |
1422 | printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name); | 1422 | 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 | } | 1447 | } |
1448 | break; | 1448 | break; |
1449 | case 0x01: | 1449 | case 0x01: |
1450 | printk(KERN_WARNING "%s: Unrecognized srb command \n", dev->name); | 1450 | printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name); |
1451 | break; | 1451 | break; |
1452 | case 0x04: | 1452 | case 0x04: |
1453 | printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name); | 1453 | 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 | printk(KERN_INFO "%s: Read Source Routing Counters issued\n", dev->name); | 1466 | printk(KERN_INFO "%s: Read Source Routing Counters issued\n", dev->name); |
1467 | break; | 1467 | break; |
1468 | case 0x01: | 1468 | case 0x01: |
1469 | printk(KERN_WARNING "%s: Unrecognized srb command \n", dev->name); | 1469 | printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name); |
1470 | break; | 1470 | break; |
1471 | case 0x04: | 1471 | case 0x04: |
1472 | printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name); | 1472 | 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 | (streamer_mmio + LAPDINC))); | 1555 | (streamer_mmio + LAPDINC))); |
1556 | } | 1556 | } |
1557 | 1557 | ||
1558 | printk("next %04x, fs %02x, len %04x \n", next, | 1558 | printk("next %04x, fs %02x, len %04x\n", next, |
1559 | status, len); | 1559 | status, len); |
1560 | } | 1560 | } |
1561 | #endif | 1561 | #endif |
@@ -1592,7 +1592,7 @@ static void streamer_arb_cmd(struct net_device *dev) | |||
1592 | 1592 | ||
1593 | mac_frame->protocol = tr_type_trans(mac_frame, dev); | 1593 | mac_frame->protocol = tr_type_trans(mac_frame, dev); |
1594 | #if STREAMER_NETWORK_MONITOR | 1594 | #if STREAMER_NETWORK_MONITOR |
1595 | printk(KERN_WARNING "%s: Received MAC Frame, details: \n", | 1595 | printk(KERN_WARNING "%s: Received MAC Frame, details:\n", |
1596 | dev->name); | 1596 | dev->name); |
1597 | mac_hdr = tr_hdr(mac_frame); | 1597 | mac_hdr = tr_hdr(mac_frame); |
1598 | printk(KERN_WARNING | 1598 | printk(KERN_WARNING |
@@ -1668,15 +1668,15 @@ drop_frame: | |||
1668 | /* If serious error */ | 1668 | /* If serious error */ |
1669 | if (streamer_priv->streamer_message_level) { | 1669 | if (streamer_priv->streamer_message_level) { |
1670 | if (lan_status_diff & LSC_SIG_LOSS) | 1670 | if (lan_status_diff & LSC_SIG_LOSS) |
1671 | printk(KERN_WARNING "%s: No receive signal detected \n", dev->name); | 1671 | printk(KERN_WARNING "%s: No receive signal detected\n", dev->name); |
1672 | if (lan_status_diff & LSC_HARD_ERR) | 1672 | if (lan_status_diff & LSC_HARD_ERR) |
1673 | printk(KERN_INFO "%s: Beaconing \n", dev->name); | 1673 | printk(KERN_INFO "%s: Beaconing\n", dev->name); |
1674 | if (lan_status_diff & LSC_SOFT_ERR) | 1674 | if (lan_status_diff & LSC_SOFT_ERR) |
1675 | printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame \n", dev->name); | 1675 | printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame\n", dev->name); |
1676 | if (lan_status_diff & LSC_TRAN_BCN) | 1676 | if (lan_status_diff & LSC_TRAN_BCN) |
1677 | printk(KERN_INFO "%s: We are tranmitting the beacon, aaah\n", dev->name); | 1677 | printk(KERN_INFO "%s: We are tranmitting the beacon, aaah\n", dev->name); |
1678 | if (lan_status_diff & LSC_SS) | 1678 | if (lan_status_diff & LSC_SS) |
1679 | printk(KERN_INFO "%s: Single Station on the ring \n", dev->name); | 1679 | printk(KERN_INFO "%s: Single Station on the ring\n", dev->name); |
1680 | if (lan_status_diff & LSC_RING_REC) | 1680 | if (lan_status_diff & LSC_RING_REC) |
1681 | printk(KERN_INFO "%s: Ring recovery ongoing\n", dev->name); | 1681 | printk(KERN_INFO "%s: Ring recovery ongoing\n", dev->name); |
1682 | if (lan_status_diff & LSC_FDX_MODE) | 1682 | if (lan_status_diff & LSC_FDX_MODE) |
@@ -1685,7 +1685,7 @@ drop_frame: | |||
1685 | 1685 | ||
1686 | if (lan_status_diff & LSC_CO) { | 1686 | if (lan_status_diff & LSC_CO) { |
1687 | if (streamer_priv->streamer_message_level) | 1687 | if (streamer_priv->streamer_message_level) |
1688 | printk(KERN_INFO "%s: Counter Overflow \n", dev->name); | 1688 | printk(KERN_INFO "%s: Counter Overflow\n", dev->name); |
1689 | 1689 | ||
1690 | /* Issue READ.LOG command */ | 1690 | /* Issue READ.LOG command */ |
1691 | 1691 | ||
@@ -1715,7 +1715,7 @@ drop_frame: | |||
1715 | streamer_priv->streamer_lan_status = lan_status; | 1715 | streamer_priv->streamer_lan_status = lan_status; |
1716 | } /* Lan.change.status */ | 1716 | } /* Lan.change.status */ |
1717 | else | 1717 | else |
1718 | printk(KERN_WARNING "%s: Unknown arb command \n", dev->name); | 1718 | printk(KERN_WARNING "%s: Unknown arb command\n", dev->name); |
1719 | } | 1719 | } |
1720 | 1720 | ||
1721 | static void streamer_asb_bh(struct net_device *dev) | 1721 | static void streamer_asb_bh(struct net_device *dev) |
@@ -1746,10 +1746,10 @@ static void streamer_asb_bh(struct net_device *dev) | |||
1746 | rc=ntohs(readw(streamer_mmio+LAPD)) >> 8; | 1746 | rc=ntohs(readw(streamer_mmio+LAPD)) >> 8; |
1747 | switch (rc) { | 1747 | switch (rc) { |
1748 | case 0x01: | 1748 | case 0x01: |
1749 | printk(KERN_WARNING "%s: Unrecognized command code \n", dev->name); | 1749 | printk(KERN_WARNING "%s: Unrecognized command code\n", dev->name); |
1750 | break; | 1750 | break; |
1751 | case 0x26: | 1751 | case 0x26: |
1752 | printk(KERN_WARNING "%s: Unrecognized buffer address \n", dev->name); | 1752 | printk(KERN_WARNING "%s: Unrecognized buffer address\n", dev->name); |
1753 | break; | 1753 | break; |
1754 | case 0xFF: | 1754 | case 0xFF: |
1755 | /* Valid response, everything should be ok again */ | 1755 | /* Valid response, everything should be ok again */ |