diff options
author | Joe Perches <joe@perches.com> | 2014-09-09 23:27:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-09 23:37:08 -0400 |
commit | fe3881cf7e09dfb93e4a4c65f44e2d92f92d0022 (patch) | |
tree | 43d950cfb847614ba2e0cea08d8d024502aa8a47 /drivers/net/ethernet/sun | |
parent | 46cfd725c377bc5bb32b56b5151d6de4cb5a71e3 (diff) |
drivers/net: Convert remaining uses of pr_warning to pr_warn
Use the much more common pr_warn instead of pr_warning.
Other miscellanea:
o Typo fixes submiting/submitting
o Coalesce formats
o Realign arguments
o Add missing terminating '\n' to formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sun')
-rw-r--r-- | drivers/net/ethernet/sun/cassini.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sun/niu.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/sun/sunvnet.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c index 37f87ff28f03..02d370e58110 100644 --- a/drivers/net/ethernet/sun/cassini.c +++ b/drivers/net/ethernet/sun/cassini.c | |||
@@ -4962,7 +4962,7 @@ static int cas_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
4962 | pci_cmd |= PCI_COMMAND_PARITY; | 4962 | pci_cmd |= PCI_COMMAND_PARITY; |
4963 | pci_write_config_word(pdev, PCI_COMMAND, pci_cmd); | 4963 | pci_write_config_word(pdev, PCI_COMMAND, pci_cmd); |
4964 | if (pci_try_set_mwi(pdev)) | 4964 | if (pci_try_set_mwi(pdev)) |
4965 | pr_warning("Could not enable MWI for %s\n", pci_name(pdev)); | 4965 | pr_warn("Could not enable MWI for %s\n", pci_name(pdev)); |
4966 | 4966 | ||
4967 | cas_program_bridge(pdev); | 4967 | cas_program_bridge(pdev); |
4968 | 4968 | ||
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c index 8216be46540f..904fd1ab5f6e 100644 --- a/drivers/net/ethernet/sun/niu.c +++ b/drivers/net/ethernet/sun/niu.c | |||
@@ -8717,8 +8717,8 @@ static void niu_divide_channels(struct niu_parent *parent, | |||
8717 | parent->txchan_per_port[i] = 1; | 8717 | parent->txchan_per_port[i] = 1; |
8718 | } | 8718 | } |
8719 | if (tot_rx < NIU_NUM_RXCHAN || tot_tx < NIU_NUM_TXCHAN) { | 8719 | if (tot_rx < NIU_NUM_RXCHAN || tot_tx < NIU_NUM_TXCHAN) { |
8720 | pr_warning("niu%d: Driver bug, wasted channels, RX[%d] TX[%d]\n", | 8720 | pr_warn("niu%d: Driver bug, wasted channels, RX[%d] TX[%d]\n", |
8721 | parent->index, tot_rx, tot_tx); | 8721 | parent->index, tot_rx, tot_tx); |
8722 | } | 8722 | } |
8723 | } | 8723 | } |
8724 | 8724 | ||
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c index 23c89ab5a6ad..a4657a401278 100644 --- a/drivers/net/ethernet/sun/sunvnet.c +++ b/drivers/net/ethernet/sun/sunvnet.c | |||
@@ -534,7 +534,7 @@ static void vnet_event(void *arg, int event) | |||
534 | } | 534 | } |
535 | 535 | ||
536 | if (unlikely(event != LDC_EVENT_DATA_READY)) { | 536 | if (unlikely(event != LDC_EVENT_DATA_READY)) { |
537 | pr_warning("Unexpected LDC event %d\n", event); | 537 | pr_warn("Unexpected LDC event %d\n", event); |
538 | spin_unlock_irqrestore(&vio->lock, flags); | 538 | spin_unlock_irqrestore(&vio->lock, flags); |
539 | return; | 539 | return; |
540 | } | 540 | } |