summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBernd Krumboeck <b.krumboeck@gmail.com>2012-12-18 18:51:04 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2013-01-26 16:59:01 +0100
commite2d5f2c7d66224c1a401ed1f797e467c02c025b8 (patch)
treed7063dc977fc4208d717e33961433aa5193db5b2 /drivers
parenta04282f54b52cf5a629a98f09712da1e630a1060 (diff)
downloadlinux-3.10-e2d5f2c7d66224c1a401ed1f797e467c02c025b8.tar.gz
linux-3.10-e2d5f2c7d66224c1a401ed1f797e467c02c025b8.tar.bz2
linux-3.10-e2d5f2c7d66224c1a401ed1f797e467c02c025b8.zip
can: usb_8dev: add LED trigger support
Add support for canbus activity led indicators on usb_8dev devices by calling appropriate can_led functions. These are only enabled when CONFIG_CAN_LEDS is Y, becomes no-op otherwise. Signed-off-by: Bernd Krumboeck <krumboeck@universalnet.at> Signed-off-by: Fabio Baltieri <fabio.baltieri@gmail.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/can/usb/usb_8dev.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/can/usb/usb_8dev.c b/drivers/net/can/usb/usb_8dev.c
index a9e73fa4ad0..f789e6f54a5 100644
--- a/drivers/net/can/usb/usb_8dev.c
+++ b/drivers/net/can/usb/usb_8dev.c
@@ -33,6 +33,7 @@
#include <linux/can.h>
#include <linux/can/dev.h>
#include <linux/can/error.h>
+#include <linux/can/led.h>
/* driver constants */
#define MAX_RX_URBS 20
@@ -497,6 +498,8 @@ static void usb_8dev_rx_can_msg(struct usb_8dev_priv *priv,
stats->rx_packets++;
stats->rx_bytes += cf->can_dlc;
+
+ can_led_event(priv->netdev, CAN_LED_EVENT_RX);
} else {
netdev_warn(priv->netdev, "frame type %d unknown",
msg->type);
@@ -597,6 +600,8 @@ static void usb_8dev_write_bulk_callback(struct urb *urb)
can_get_echo_skb(netdev, context->echo_index);
+ can_led_event(netdev, CAN_LED_EVENT_TX);
+
/* Release context */
context->echo_index = MAX_TX_URBS;
@@ -819,6 +824,8 @@ static int usb_8dev_open(struct net_device *netdev)
if (err)
return err;
+ can_led_event(netdev, CAN_LED_EVENT_OPEN);
+
/* finally start device */
err = usb_8dev_start(priv);
if (err) {
@@ -871,6 +878,8 @@ static int usb_8dev_close(struct net_device *netdev)
close_candev(netdev);
+ can_led_event(netdev, CAN_LED_EVENT_STOP);
+
return err;
}
@@ -978,6 +987,8 @@ static int usb_8dev_probe(struct usb_interface *intf,
(version>>8) & 0xff, version & 0xff);
}
+ devm_can_led_init(netdev);
+
return 0;
cleanup_cmd_msg_buffer: