From: Fabio Baltieri <fabio.baltieri@gmail.com>
To: Marc Kleine-Budde <mkl@pengutronix.de>, linux-can@vger.kernel.org
Cc: Kurt Van Dijck <kurt.van.dijck@eia.be>,
Wolfgang Grandegger <wg@grandegger.com>,
Oliver Hartkopp <socketcan@hartkopp.net>,
linux-kernel@vger.kernel.org,
Fabio Baltieri <fabio.baltieri@gmail.com>
Subject: [PATCH 7/9] can: sja1000: add LED trigger support
Date: Sun, 16 Dec 2012 12:08:31 +0100 [thread overview]
Message-ID: <1355656113-9562-8-git-send-email-fabio.baltieri@gmail.com> (raw)
In-Reply-To: <1355656113-9562-1-git-send-email-fabio.baltieri@gmail.com>
Add support for canbus activity led indicators on sja1000 devices by
calling appropriate can_led functions.
These are only enabled when CONFIG_CAN_LEDS is Y, becomes no-op
otherwise.
Cc: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Fabio Baltieri <fabio.baltieri@gmail.com>
---
drivers/net/can/sja1000/sja1000.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index 83ee11e..daf4013 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -60,6 +60,7 @@
#include <linux/can/dev.h>
#include <linux/can/error.h>
+#include <linux/can/led.h>
#include "sja1000.h"
@@ -368,6 +369,8 @@ static void sja1000_rx(struct net_device *dev)
stats->rx_packets++;
stats->rx_bytes += cf->can_dlc;
+
+ can_led_event(dev, CAN_LED_EVENT_RX);
}
static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
@@ -521,6 +524,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
can_get_echo_skb(dev, 0);
}
netif_wake_queue(dev);
+ can_led_event(dev, CAN_LED_EVENT_TX);
}
if (isrc & IRQ_RI) {
/* receive interrupt */
@@ -575,6 +579,8 @@ static int sja1000_open(struct net_device *dev)
/* init and start chi */
sja1000_start(dev);
+ can_led_event(dev, CAN_LED_EVENT_OPEN);
+
netif_start_queue(dev);
return 0;
@@ -592,6 +598,8 @@ static int sja1000_close(struct net_device *dev)
close_candev(dev);
+ can_led_event(dev, CAN_LED_EVENT_STOP);
+
return 0;
}
@@ -639,6 +647,8 @@ static const struct net_device_ops sja1000_netdev_ops = {
int register_sja1000dev(struct net_device *dev)
{
+ int ret;
+
if (!sja1000_probe_chip(dev))
return -ENODEV;
@@ -648,7 +658,12 @@ int register_sja1000dev(struct net_device *dev)
set_reset_mode(dev);
chipset_init(dev);
- return register_candev(dev);
+ ret = register_candev(dev);
+
+ if (!ret)
+ devm_can_led_init(dev);
+
+ return ret;
}
EXPORT_SYMBOL_GPL(register_sja1000dev);
--
1.7.12.1
next prev parent reply other threads:[~2012-12-16 11:10 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-16 11:08 [PATCH 0/9] tx/rx LED trigger support Fabio Baltieri
2012-12-16 11:08 ` [PATCH 1/9] can: add " Fabio Baltieri
2012-12-17 7:28 ` Bernd Krumboeck
2012-12-17 9:34 ` Kurt Van Dijck
2012-12-17 17:41 ` Fabio Baltieri
2012-12-17 20:20 ` "Bernd Krumböck"
2012-12-17 21:42 ` Fabio Baltieri
2012-12-18 6:02 ` "Bernd Krumböck"
2012-12-16 11:08 ` [PATCH 2/9] can: flexcan: add " Fabio Baltieri
2012-12-16 11:08 ` [PATCH 3/9] can: at91_can: " Fabio Baltieri
2012-12-16 11:08 ` [PATCH 4/9] can: ti_hecc: " Fabio Baltieri
2012-12-16 11:08 ` [PATCH 5/9] can: c_can: " Fabio Baltieri
2012-12-16 11:08 ` [PATCH 6/9] can: mcp251x: " Fabio Baltieri
2012-12-16 11:08 ` Fabio Baltieri [this message]
2012-12-16 11:08 ` [PATCH 8/9] can: export a safe netdev_priv wrapper for candev Fabio Baltieri
2012-12-16 11:08 ` [PATCH 9/9] can: rename LED trigger name on netdev renames Fabio Baltieri
2012-12-16 22:37 ` [PATCH 0/9] tx/rx LED trigger support Marc Kleine-Budde
2012-12-16 22:51 ` Fabio Baltieri
2012-12-17 9:35 ` Kurt Van Dijck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1355656113-9562-8-git-send-email-fabio.baltieri@gmail.com \
--to=fabio.baltieri@gmail.com \
--cc=kurt.van.dijck@eia.be \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=socketcan@hartkopp.net \
--cc=wg@grandegger.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).