aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/dev.c
diff options
context:
space:
mode:
authorKurt Van Dijck <kurt.van.dijck@eia.be>2012-12-18 12:50:57 -0500
committerMarc Kleine-Budde <mkl@pengutronix.de>2013-01-26 10:58:59 -0500
commita1ef7bd9fce8aba8e4701e60208148fb3bc9bdd4 (patch)
tree0b9008a80fdbe8304f1983980996117024ebc96a /drivers/net/can/dev.c
parentbf03a5379cd3492fbeca42111340581ba9dee0b8 (diff)
can: rename LED trigger name on netdev renames
The LED trigger name for CAN devices is based on the initial CAN device name, but does never change. The LED trigger name is not guaranteed to be unique in case of hotplugging CAN devices. This patch tries to address this problem by modifying the LED trigger name according to the CAN device name when the latter changes. v1 - Kurt Van Dijck v2 - Fabio Baltieri - remove rename blocking if trigger is bound - use led-subsystem function for the actual rename (still WiP) - call init/exit functions from dev.c v3 - Kurt Van Dijck - safe operation for non-candev based devices (vcan, slcan) based on earlier patch v4 - Kurt Van Dijck - trivial patch mistakes fixed Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be> Signed-off-by: Fabio Baltieri <fabio.baltieri@gmail.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/dev.c')
-rw-r--r--drivers/net/can/dev.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 13e738098fbe..6abc6e59778e 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -25,6 +25,7 @@
25#include <linux/can.h> 25#include <linux/can.h>
26#include <linux/can/dev.h> 26#include <linux/can/dev.h>
27#include <linux/can/netlink.h> 27#include <linux/can/netlink.h>
28#include <linux/can/led.h>
28#include <net/rtnetlink.h> 29#include <net/rtnetlink.h>
29 30
30#define MOD_DESC "CAN device driver interface" 31#define MOD_DESC "CAN device driver interface"
@@ -811,6 +812,8 @@ static __init int can_dev_init(void)
811{ 812{
812 int err; 813 int err;
813 814
815 can_led_notifier_init();
816
814 err = rtnl_link_register(&can_link_ops); 817 err = rtnl_link_register(&can_link_ops);
815 if (!err) 818 if (!err)
816 printk(KERN_INFO MOD_DESC "\n"); 819 printk(KERN_INFO MOD_DESC "\n");
@@ -822,6 +825,8 @@ module_init(can_dev_init);
822static __exit void can_dev_exit(void) 825static __exit void can_dev_exit(void)
823{ 826{
824 rtnl_link_unregister(&can_link_ops); 827 rtnl_link_unregister(&can_link_ops);
828
829 can_led_notifier_exit();
825} 830}
826module_exit(can_dev_exit); 831module_exit(can_dev_exit);
827 832