diff options
Diffstat (limited to 'drivers/net/can/ti_hecc.c')
-rw-r--r-- | drivers/net/can/ti_hecc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c index aee925ab0de8..0d18a9319720 100644 --- a/drivers/net/can/ti_hecc.c +++ b/drivers/net/can/ti_hecc.c | |||
@@ -306,7 +306,7 @@ static int ti_hecc_set_btc(struct ti_hecc_priv *priv) | |||
306 | if (bit_timing->brp > 4) | 306 | if (bit_timing->brp > 4) |
307 | can_btc |= HECC_CANBTC_SAM; | 307 | can_btc |= HECC_CANBTC_SAM; |
308 | else | 308 | else |
309 | dev_warn(priv->ndev->dev.parent, "WARN: Triple" \ | 309 | netdev_warn(priv->ndev, "WARN: Triple" |
310 | "sampling not set due to h/w limitations"); | 310 | "sampling not set due to h/w limitations"); |
311 | } | 311 | } |
312 | can_btc |= ((bit_timing->sjw - 1) & 0x3) << 8; | 312 | can_btc |= ((bit_timing->sjw - 1) & 0x3) << 8; |
@@ -315,7 +315,7 @@ static int ti_hecc_set_btc(struct ti_hecc_priv *priv) | |||
315 | /* ERM being set to 0 by default meaning resync at falling edge */ | 315 | /* ERM being set to 0 by default meaning resync at falling edge */ |
316 | 316 | ||
317 | hecc_write(priv, HECC_CANBTC, can_btc); | 317 | hecc_write(priv, HECC_CANBTC, can_btc); |
318 | dev_info(priv->ndev->dev.parent, "setting CANBTC=%#x\n", can_btc); | 318 | netdev_info(priv->ndev, "setting CANBTC=%#x\n", can_btc); |
319 | 319 | ||
320 | return 0; | 320 | return 0; |
321 | } | 321 | } |
@@ -332,7 +332,7 @@ static void ti_hecc_reset(struct net_device *ndev) | |||
332 | u32 cnt; | 332 | u32 cnt; |
333 | struct ti_hecc_priv *priv = netdev_priv(ndev); | 333 | struct ti_hecc_priv *priv = netdev_priv(ndev); |
334 | 334 | ||
335 | dev_dbg(ndev->dev.parent, "resetting hecc ...\n"); | 335 | netdev_dbg(ndev, "resetting hecc ...\n"); |
336 | hecc_set_bit(priv, HECC_CANMC, HECC_CANMC_SRES); | 336 | hecc_set_bit(priv, HECC_CANMC, HECC_CANMC_SRES); |
337 | 337 | ||
338 | /* Set change control request and wait till enabled */ | 338 | /* Set change control request and wait till enabled */ |
@@ -507,7 +507,7 @@ static netdev_tx_t ti_hecc_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
507 | if (unlikely(hecc_read(priv, HECC_CANME) & mbx_mask)) { | 507 | if (unlikely(hecc_read(priv, HECC_CANME) & mbx_mask)) { |
508 | spin_unlock_irqrestore(&priv->mbx_lock, flags); | 508 | spin_unlock_irqrestore(&priv->mbx_lock, flags); |
509 | netif_stop_queue(ndev); | 509 | netif_stop_queue(ndev); |
510 | dev_err(priv->ndev->dev.parent, | 510 | netdev_err(priv->ndev, |
511 | "BUG: TX mbx not ready tx_head=%08X, tx_tail=%08X\n", | 511 | "BUG: TX mbx not ready tx_head=%08X, tx_tail=%08X\n", |
512 | priv->tx_head, priv->tx_tail); | 512 | priv->tx_head, priv->tx_tail); |
513 | return NETDEV_TX_BUSY; | 513 | return NETDEV_TX_BUSY; |
@@ -561,7 +561,7 @@ static int ti_hecc_rx_pkt(struct ti_hecc_priv *priv, int mbxno) | |||
561 | skb = alloc_can_skb(priv->ndev, &cf); | 561 | skb = alloc_can_skb(priv->ndev, &cf); |
562 | if (!skb) { | 562 | if (!skb) { |
563 | if (printk_ratelimit()) | 563 | if (printk_ratelimit()) |
564 | dev_err(priv->ndev->dev.parent, | 564 | netdev_err(priv->ndev, |
565 | "ti_hecc_rx_pkt: alloc_can_skb() failed\n"); | 565 | "ti_hecc_rx_pkt: alloc_can_skb() failed\n"); |
566 | return -ENOMEM; | 566 | return -ENOMEM; |
567 | } | 567 | } |
@@ -679,7 +679,7 @@ static int ti_hecc_error(struct net_device *ndev, int int_status, | |||
679 | skb = alloc_can_err_skb(ndev, &cf); | 679 | skb = alloc_can_err_skb(ndev, &cf); |
680 | if (!skb) { | 680 | if (!skb) { |
681 | if (printk_ratelimit()) | 681 | if (printk_ratelimit()) |
682 | dev_err(priv->ndev->dev.parent, | 682 | netdev_err(priv->ndev, |
683 | "ti_hecc_error: alloc_can_err_skb() failed\n"); | 683 | "ti_hecc_error: alloc_can_err_skb() failed\n"); |
684 | return -ENOMEM; | 684 | return -ENOMEM; |
685 | } | 685 | } |
@@ -695,7 +695,7 @@ static int ti_hecc_error(struct net_device *ndev, int int_status, | |||
695 | cf->data[1] |= CAN_ERR_CRTL_RX_WARNING; | 695 | cf->data[1] |= CAN_ERR_CRTL_RX_WARNING; |
696 | } | 696 | } |
697 | hecc_set_bit(priv, HECC_CANES, HECC_CANES_EW); | 697 | hecc_set_bit(priv, HECC_CANES, HECC_CANES_EW); |
698 | dev_dbg(priv->ndev->dev.parent, "Error Warning interrupt\n"); | 698 | netdev_dbg(priv->ndev, "Error Warning interrupt\n"); |
699 | hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_CCR); | 699 | hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_CCR); |
700 | } | 700 | } |
701 | 701 | ||
@@ -710,7 +710,7 @@ static int ti_hecc_error(struct net_device *ndev, int int_status, | |||
710 | cf->data[1] |= CAN_ERR_CRTL_RX_PASSIVE; | 710 | cf->data[1] |= CAN_ERR_CRTL_RX_PASSIVE; |
711 | } | 711 | } |
712 | hecc_set_bit(priv, HECC_CANES, HECC_CANES_EP); | 712 | hecc_set_bit(priv, HECC_CANES, HECC_CANES_EP); |
713 | dev_dbg(priv->ndev->dev.parent, "Error passive interrupt\n"); | 713 | netdev_dbg(priv->ndev, "Error passive interrupt\n"); |
714 | hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_CCR); | 714 | hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_CCR); |
715 | } | 715 | } |
716 | 716 | ||
@@ -835,7 +835,7 @@ static int ti_hecc_open(struct net_device *ndev) | |||
835 | err = request_irq(ndev->irq, ti_hecc_interrupt, IRQF_SHARED, | 835 | err = request_irq(ndev->irq, ti_hecc_interrupt, IRQF_SHARED, |
836 | ndev->name, ndev); | 836 | ndev->name, ndev); |
837 | if (err) { | 837 | if (err) { |
838 | dev_err(ndev->dev.parent, "error requesting interrupt\n"); | 838 | netdev_err(ndev, "error requesting interrupt\n"); |
839 | return err; | 839 | return err; |
840 | } | 840 | } |
841 | 841 | ||
@@ -844,7 +844,7 @@ static int ti_hecc_open(struct net_device *ndev) | |||
844 | /* Open common can device */ | 844 | /* Open common can device */ |
845 | err = open_candev(ndev); | 845 | err = open_candev(ndev); |
846 | if (err) { | 846 | if (err) { |
847 | dev_err(ndev->dev.parent, "open_candev() failed %d\n", err); | 847 | netdev_err(ndev, "open_candev() failed %d\n", err); |
848 | ti_hecc_transceiver_switch(priv, 0); | 848 | ti_hecc_transceiver_switch(priv, 0); |
849 | free_irq(ndev->irq, ndev); | 849 | free_irq(ndev->irq, ndev); |
850 | return err; | 850 | return err; |