aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/pch_can.c
diff options
context:
space:
mode:
authorTomoya <tomoya-linux@dsn.okisemi.com>2010-12-12 15:24:16 -0500
committerDavid S. Miller <davem@davemloft.net>2010-12-13 15:24:23 -0500
commit435b4efe93d4cec3aa0b36e8707df8d292d3641b (patch)
tree568341dd8e989f81a5e487369c97f3ee991853ad /drivers/net/can/pch_can.c
parente91530ea959295a31911488c62088d5c372032ea (diff)
pch_can: Replace netdev_dbg instead of dev_dbg partly
For easy to readable, use netdev_dbg instead of dev_dbg partly Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/pch_can.c')
-rw-r--r--drivers/net/can/pch_can.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 293be5151f05..0093a01fefda 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -222,7 +222,7 @@ static void pch_can_set_run_mode(struct pch_can_priv *priv,
222 break; 222 break;
223 223
224 default: 224 default:
225 dev_err(&priv->ndev->dev, "%s -> Invalid Mode.\n", __func__); 225 netdev_err(priv->ndev, "%s -> Invalid Mode.\n", __func__);
226 break; 226 break;
227 } 227 }
228} 228}
@@ -275,7 +275,7 @@ static void pch_can_set_int_enables(struct pch_can_priv *priv,
275 break; 275 break;
276 276
277 default: 277 default:
278 dev_err(&priv->ndev->dev, "Invalid interrupt number.\n"); 278 netdev_err(priv->ndev, "Invalid interrupt number.\n");
279 break; 279 break;
280 } 280 }
281} 281}
@@ -528,7 +528,7 @@ static void pch_can_error(struct net_device *ndev, u32 status)
528 cf->data[1] |= CAN_ERR_CRTL_RX_WARNING; 528 cf->data[1] |= CAN_ERR_CRTL_RX_WARNING;
529 if ((errc & PCH_TEC) > 96) 529 if ((errc & PCH_TEC) > 96)
530 cf->data[1] |= CAN_ERR_CRTL_TX_WARNING; 530 cf->data[1] |= CAN_ERR_CRTL_TX_WARNING;
531 dev_warn(&ndev->dev, 531 netdev_dbg(ndev,
532 "%s -> Error Counter is more than 96.\n", __func__); 532 "%s -> Error Counter is more than 96.\n", __func__);
533 } 533 }
534 /* Error passive interrupt. */ 534 /* Error passive interrupt. */
@@ -540,7 +540,7 @@ static void pch_can_error(struct net_device *ndev, u32 status)
540 cf->data[1] |= CAN_ERR_CRTL_RX_PASSIVE; 540 cf->data[1] |= CAN_ERR_CRTL_RX_PASSIVE;
541 if ((errc & PCH_TEC) > 127) 541 if ((errc & PCH_TEC) > 127)
542 cf->data[1] |= CAN_ERR_CRTL_TX_PASSIVE; 542 cf->data[1] |= CAN_ERR_CRTL_TX_PASSIVE;
543 dev_err(&ndev->dev, 543 netdev_dbg(ndev,
544 "%s -> CAN controller is ERROR PASSIVE .\n", __func__); 544 "%s -> CAN controller is ERROR PASSIVE .\n", __func__);
545 } 545 }
546 546
@@ -859,10 +859,10 @@ static int pch_can_open(struct net_device *ndev)
859 859
860 retval = pci_enable_msi(priv->dev); 860 retval = pci_enable_msi(priv->dev);
861 if (retval) { 861 if (retval) {
862 dev_info(&ndev->dev, "PCH CAN opened without MSI\n"); 862 netdev_err(ndev, "PCH CAN opened without MSI\n");
863 priv->use_msi = 0; 863 priv->use_msi = 0;
864 } else { 864 } else {
865 dev_info(&ndev->dev, "PCH CAN opened with MSI\n"); 865 netdev_err(ndev, "PCH CAN opened with MSI\n");
866 priv->use_msi = 1; 866 priv->use_msi = 1;
867 } 867 }
868 868
@@ -870,14 +870,14 @@ static int pch_can_open(struct net_device *ndev)
870 retval = request_irq(priv->dev->irq, pch_can_interrupt, IRQF_SHARED, 870 retval = request_irq(priv->dev->irq, pch_can_interrupt, IRQF_SHARED,
871 ndev->name, ndev); 871 ndev->name, ndev);
872 if (retval) { 872 if (retval) {
873 dev_err(&ndev->dev, "request_irq failed.\n"); 873 netdev_err(ndev, "request_irq failed.\n");
874 goto req_irq_err; 874 goto req_irq_err;
875 } 875 }
876 876
877 /* Open common can device */ 877 /* Open common can device */
878 retval = open_candev(ndev); 878 retval = open_candev(ndev);
879 if (retval) { 879 if (retval) {
880 dev_err(ndev->dev.parent, "open_candev() failed %d\n", retval); 880 netdev_err(ndev, "open_candev() failed %d\n", retval);
881 goto err_open_candev; 881 goto err_open_candev;
882 } 882 }
883 883