diff options
author | Bernd Krumboeck <b.krumboeck@gmail.com> | 2012-12-18 12:51:04 -0500 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-01-26 10:59:01 -0500 |
commit | e2d5f2c7d66224c1a401ed1f797e467c02c025b8 (patch) | |
tree | d7063dc977fc4208d717e33961433aa5193db5b2 | |
parent | a04282f54b52cf5a629a98f09712da1e630a1060 (diff) |
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>
-rw-r--r-- | drivers/net/can/usb/usb_8dev.c | 11 |
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 a9e73fa4ad0f..f789e6f54a55 100644 --- a/drivers/net/can/usb/usb_8dev.c +++ b/drivers/net/can/usb/usb_8dev.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/can.h> | 33 | #include <linux/can.h> |
34 | #include <linux/can/dev.h> | 34 | #include <linux/can/dev.h> |
35 | #include <linux/can/error.h> | 35 | #include <linux/can/error.h> |
36 | #include <linux/can/led.h> | ||
36 | 37 | ||
37 | /* driver constants */ | 38 | /* driver constants */ |
38 | #define MAX_RX_URBS 20 | 39 | #define MAX_RX_URBS 20 |
@@ -497,6 +498,8 @@ static void usb_8dev_rx_can_msg(struct usb_8dev_priv *priv, | |||
497 | 498 | ||
498 | stats->rx_packets++; | 499 | stats->rx_packets++; |
499 | stats->rx_bytes += cf->can_dlc; | 500 | stats->rx_bytes += cf->can_dlc; |
501 | |||
502 | can_led_event(priv->netdev, CAN_LED_EVENT_RX); | ||
500 | } else { | 503 | } else { |
501 | netdev_warn(priv->netdev, "frame type %d unknown", | 504 | netdev_warn(priv->netdev, "frame type %d unknown", |
502 | msg->type); | 505 | msg->type); |
@@ -597,6 +600,8 @@ static void usb_8dev_write_bulk_callback(struct urb *urb) | |||
597 | 600 | ||
598 | can_get_echo_skb(netdev, context->echo_index); | 601 | can_get_echo_skb(netdev, context->echo_index); |
599 | 602 | ||
603 | can_led_event(netdev, CAN_LED_EVENT_TX); | ||
604 | |||
600 | /* Release context */ | 605 | /* Release context */ |
601 | context->echo_index = MAX_TX_URBS; | 606 | context->echo_index = MAX_TX_URBS; |
602 | 607 | ||
@@ -819,6 +824,8 @@ static int usb_8dev_open(struct net_device *netdev) | |||
819 | if (err) | 824 | if (err) |
820 | return err; | 825 | return err; |
821 | 826 | ||
827 | can_led_event(netdev, CAN_LED_EVENT_OPEN); | ||
828 | |||
822 | /* finally start device */ | 829 | /* finally start device */ |
823 | err = usb_8dev_start(priv); | 830 | err = usb_8dev_start(priv); |
824 | if (err) { | 831 | if (err) { |
@@ -871,6 +878,8 @@ static int usb_8dev_close(struct net_device *netdev) | |||
871 | 878 | ||
872 | close_candev(netdev); | 879 | close_candev(netdev); |
873 | 880 | ||
881 | can_led_event(netdev, CAN_LED_EVENT_STOP); | ||
882 | |||
874 | return err; | 883 | return err; |
875 | } | 884 | } |
876 | 885 | ||
@@ -978,6 +987,8 @@ static int usb_8dev_probe(struct usb_interface *intf, | |||
978 | (version>>8) & 0xff, version & 0xff); | 987 | (version>>8) & 0xff, version & 0xff); |
979 | } | 988 | } |
980 | 989 | ||
990 | devm_can_led_init(netdev); | ||
991 | |||
981 | return 0; | 992 | return 0; |
982 | 993 | ||
983 | cleanup_cmd_msg_buffer: | 994 | cleanup_cmd_msg_buffer: |