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>

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 13e738098fbe60cf8070e1d713dc155a102e036f..6abc6e59778e17e4cca8c156c7615a90dc40ef80 100644 (file)
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -25,6 +25,7 @@
 #include <linux/can.h>
 #include <linux/can/dev.h>
 #include <linux/can/netlink.h>
+#include <linux/can/led.h>
 #include <net/rtnetlink.h>
 
 #define MOD_DESC "CAN device driver interface"
@@ -811,6 +812,8 @@ static __init int can_dev_init(void)
 {
        int err;
 
+       can_led_notifier_init();
+
        err = rtnl_link_register(&can_link_ops);
        if (!err)
                printk(KERN_INFO MOD_DESC "\n");
@@ -822,6 +825,8 @@ module_init(can_dev_init);
 static __exit void can_dev_exit(void)
 {
        rtnl_link_unregister(&can_link_ops);
+
+       can_led_notifier_exit();
 }
 module_exit(can_dev_exit);
 

diff --git a/drivers/net/can/led.c b/drivers/net/can/led.c
index c50a0d741c5783575907d2c1920455aa340bebe8..f27fca65dc4a3590f99e3e55428326c19e937425 100644 (file)
--- a/drivers/net/can/led.c
+++ b/drivers/net/can/led.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2012, Fabio Baltieri <fabio.baltieri@gmail.com>
+ * Copyright 2012, Kurt Van Dijck <kurt.van.dijck@eia.be>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -84,3 +85,40 @@ void devm_can_led_init(struct net_device *netdev)
        devres_add(&netdev->dev, res);
 }
 EXPORT_SYMBOL_GPL(devm_can_led_init);
+
+/* NETDEV rename notifier to rename the associated led triggers too */
+static int can_led_notifier(struct notifier_block *nb, unsigned long msg,
+                       void *data)
+{
+       struct net_device *netdev = data;
+       struct can_priv *priv = safe_candev_priv(netdev);
+       char name[CAN_LED_NAME_SZ];
+
+       if (!priv)
+               return NOTIFY_DONE;
+
+       if (msg == NETDEV_CHANGENAME) {
+               snprintf(name, sizeof(name), "%s-tx", netdev->name);
+               led_trigger_rename_static(name, priv->tx_led_trig);
+
+               snprintf(name, sizeof(name), "%s-rx", netdev->name);
+               led_trigger_rename_static(name, priv->rx_led_trig);
+       }
+
+       return NOTIFY_DONE;
+}
+
+/* notifier block for netdevice event */
+static struct notifier_block can_netdev_notifier __read_mostly = {
+       .notifier_call = can_led_notifier,
+};
+
+int __init can_led_notifier_init(void)
+{
+       return register_netdevice_notifier(&can_netdev_notifier);
+}
+
+void __exit can_led_notifier_exit(void)
+{
+       unregister_netdevice_notifier(&can_netdev_notifier);
+}

diff --git a/include/linux/can/led.h b/include/linux/can/led.h
index 12d5549abb95c4ab1eb9c220785e48dbdf5fed56..9c1167baf273e7e62cb29dbfb89266e11f1c29d6 100644 (file)
--- a/include/linux/can/led.h
+++ b/include/linux/can/led.h
@@ -26,6 +26,8 @@ enum can_led_event {
 
 void can_led_event(struct net_device *netdev, enum can_led_event event);
 void devm_can_led_init(struct net_device *netdev);
+int __init can_led_notifier_init(void);
+void __exit can_led_notifier_exit(void);
 
 #else
 
@@ -36,6 +38,13 @@ static inline void can_led_event(struct net_device *netdev,
 static inline void devm_can_led_init(struct net_device *netdev)
 {
 }
+static inline int can_led_notifier_init(void)
+{
+       return 0;
+}
+static inline void can_led_notifier_exit(void)
+{
+}
 
 #endif