diff options
author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2014-01-10 18:41:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-14 02:28:48 -0500 |
commit | 090d560fc4723f61b561c8fceb810d4645b49b4c (patch) | |
tree | c7b1d84cf21460ce30fb7a000984d901cb2998ec /drivers/net/ethernet/renesas | |
parent | aef2b45fe459428d1861a74b08f3f57e87411f56 (diff) |
sh_eth: fix garbled TX error message
sh_eth_error() in case of a TX error tries to print a message using 2 dev_err()
calls with the first string not finished by '\n', so that the resulting message
would inevitably come out garbled, with something like "3net eth0: " inserted
in the middle. Avoid that by merging 2 calls into one.
While at it, insert an empty line after the nearby declaration.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/renesas')
-rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 888410737dbd..ba1f6c928b91 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c | |||
@@ -1513,11 +1513,11 @@ ignore_link: | |||
1513 | if (intr_status & mask) { | 1513 | if (intr_status & mask) { |
1514 | /* Tx error */ | 1514 | /* Tx error */ |
1515 | u32 edtrr = sh_eth_read(ndev, EDTRR); | 1515 | u32 edtrr = sh_eth_read(ndev, EDTRR); |
1516 | |||
1516 | /* dmesg */ | 1517 | /* dmesg */ |
1517 | dev_err(&ndev->dev, "TX error. status=%8.8x cur_tx=%8.8x ", | 1518 | dev_err(&ndev->dev, "TX error. status=%8.8x cur_tx=%8.8x dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n", |
1518 | intr_status, mdp->cur_tx); | 1519 | intr_status, mdp->cur_tx, mdp->dirty_tx, |
1519 | dev_err(&ndev->dev, "dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n", | 1520 | (u32)ndev->state, edtrr); |
1520 | mdp->dirty_tx, (u32) ndev->state, edtrr); | ||
1521 | /* dirty buffer free */ | 1521 | /* dirty buffer free */ |
1522 | sh_eth_txfree(ndev); | 1522 | sh_eth_txfree(ndev); |
1523 | 1523 | ||