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

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

diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index 58607f1..285f763 100644 (file)
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -39,6 +39,7 @@
 #include <linux/can.h>
 #include <linux/can/dev.h>
 #include <linux/can/error.h>
+#include <linux/can/led.h>
 
 #include "c_can.h"
 
@@ -477,6 +478,8 @@ static int c_can_read_msg_object(struct net_device *dev, int iface, int ctrl)
        stats->rx_packets++;
        stats->rx_bytes += frame->can_dlc;
 
+       can_led_event(dev, CAN_LED_EVENT_RX);
+
        return 0;
 }
 
@@ -751,6 +754,7 @@ static void c_can_do_tx(struct net_device *dev)
                                        C_CAN_IFACE(MSGCTRL_REG, 0))
                                        & IF_MCONT_DLC_MASK;
                        stats->tx_packets++;
+                       can_led_event(dev, CAN_LED_EVENT_TX);
                        c_can_inval_msg_object(dev, 0, msg_obj_no);
                } else {
                        break;
@@ -1115,6 +1119,8 @@ static int c_can_open(struct net_device *dev)
 
        napi_enable(&priv->napi);
 
+       can_led_event(dev, CAN_LED_EVENT_OPEN);
+
        /* start the c_can controller */
        c_can_start(dev);
 
@@ -1143,6 +1149,8 @@ static int c_can_close(struct net_device *dev)
        c_can_reset_ram(priv, false);
        c_can_pm_runtime_put_sync(priv);
 
+       can_led_event(dev, CAN_LED_EVENT_STOP);
+
        return 0;
 }
 
@@ -1268,6 +1276,8 @@ int register_c_can_dev(struct net_device *dev)
        err = register_candev(dev);
        if (err)
                c_can_pm_runtime_disable(priv);
+       else
+               devm_can_led_init(dev);
 
        return err;
 }