Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[pandora-kernel.git] / drivers / net / can / ti_hecc.c

diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 300581b..f21fc37 100644 (file)
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -50,6 +50,7 @@
 
 #include <linux/can/dev.h>
 #include <linux/can/error.h>
+#include <linux/can/led.h>
 #include <linux/can/platform/ti_hecc.h>
 
 #define DRV_NAME "ti_hecc"
@@ -593,6 +594,7 @@ static int ti_hecc_rx_pkt(struct ti_hecc_priv *priv, int mbxno)
        spin_unlock_irqrestore(&priv->mbx_lock, flags);
 
        stats->rx_bytes += cf->can_dlc;
+       can_led_event(priv->ndev, CAN_LED_EVENT_RX);
        netif_receive_skb(skb);
        stats->rx_packets++;
 
@@ -796,6 +798,7 @@ static irqreturn_t ti_hecc_interrupt(int irq, void *dev_id)
                        stats->tx_bytes += hecc_read_mbx(priv, mbxno,
                                                HECC_CANMCF) & 0xF;
                        stats->tx_packets++;
+                       can_led_event(ndev, CAN_LED_EVENT_TX);
                        can_get_echo_skb(ndev, mbxno);
                        --priv->tx_tail;
                }
@@ -851,6 +854,8 @@ static int ti_hecc_open(struct net_device *ndev)
                return err;
        }
 
+       can_led_event(ndev, CAN_LED_EVENT_OPEN);
+
        ti_hecc_start(ndev);
        napi_enable(&priv->napi);
        netif_start_queue(ndev);
@@ -869,6 +874,8 @@ static int ti_hecc_close(struct net_device *ndev)
        close_candev(ndev);
        ti_hecc_transceiver_switch(priv, 0);
 
+       can_led_event(ndev, CAN_LED_EVENT_STOP);
+
        return 0;
 }
 
@@ -961,6 +968,9 @@ static int ti_hecc_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "register_candev() failed\n");
                goto probe_exit_clk;
        }
+
+       devm_can_led_init(ndev);
+
        dev_info(&pdev->dev, "device registered (reg_base=%p, irq=%u)\n",
                priv->base, (u32) ndev->irq);