From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>, Johan Hovold <johan@kernel.org>,
Jacek Anaszewski <jacek.anaszewski@gmail.com>,
Pavel Machek <pavel@ucw.cz>
Cc: linux-serial@vger.kernel.org, linux-leds@vger.kernel.org,
linux-can@vger.kernel.org, kernel@pengutronix.de,
One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>,
Florian Fainelli <f.fainelli@gmail.com>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
linux-kernel@vger.kernel.org, Robin Murphy <robin.murphy@arm.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 2/3] can: simplify LED trigger handling
Date: Tue, 8 May 2018 12:05:42 +0200 [thread overview]
Message-ID: <20180508100543.12559-3-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20180508100543.12559-1-u.kleine-koenig@pengutronix.de>
The new function led_trigger_register_format allows one to simplify LED
trigger handling considerably.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/net/can/led.c | 30 +++++++-----------------------
include/linux/can/dev.h | 3 ---
2 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/drivers/net/can/led.c b/drivers/net/can/led.c
index 2d7d1b0d20f9..111f9769e9da 100644
--- a/drivers/net/can/led.c
+++ b/drivers/net/can/led.c
@@ -81,19 +81,9 @@ void devm_can_led_init(struct net_device *netdev)
return;
}
- snprintf(priv->tx_led_trig_name, sizeof(priv->tx_led_trig_name),
- "%s-tx", netdev->name);
- snprintf(priv->rx_led_trig_name, sizeof(priv->rx_led_trig_name),
- "%s-rx", netdev->name);
- snprintf(priv->rxtx_led_trig_name, sizeof(priv->rxtx_led_trig_name),
- "%s-rxtx", netdev->name);
-
- led_trigger_register_simple(priv->tx_led_trig_name,
- &priv->tx_led_trig);
- led_trigger_register_simple(priv->rx_led_trig_name,
- &priv->rx_led_trig);
- led_trigger_register_simple(priv->rxtx_led_trig_name,
- &priv->rxtx_led_trig);
+ led_trigger_register_format(&priv->tx_led_trig, "%s-tx", netdev->name);
+ led_trigger_register_format(&priv->rx_led_trig, "%s-rx", netdev->name);
+ led_trigger_register_format(&priv->rxtx_led_trig, "%s-rxtx", netdev->name);
devres_add(&netdev->dev, res);
}
@@ -105,23 +95,17 @@ static int can_led_notifier(struct notifier_block *nb, unsigned long msg,
{
struct net_device *netdev = netdev_notifier_info_to_dev(ptr);
struct can_priv *priv = safe_candev_priv(netdev);
- char name[CAN_LED_NAME_SZ];
if (!priv)
return NOTIFY_DONE;
- if (!priv->tx_led_trig || !priv->rx_led_trig || !priv->rxtx_led_trig)
- return NOTIFY_DONE;
-
if (msg == NETDEV_CHANGENAME) {
- snprintf(name, sizeof(name), "%s-tx", netdev->name);
- led_trigger_rename(priv->tx_led_trig, name);
+ led_trigger_rename(priv->tx_led_trig, "%s-tx", netdev->name);
- snprintf(name, sizeof(name), "%s-rx", netdev->name);
- led_trigger_rename(priv->rx_led_trig, name);
+ led_trigger_rename(priv->rx_led_trig, "%s-rx", netdev->name);
- snprintf(name, sizeof(name), "%s-rxtx", netdev->name);
- led_trigger_rename(priv->rxtx_led_trig, name);
+ led_trigger_rename(priv->rxtx_led_trig,
+ "%s-rxtx", netdev->name);
}
return NOTIFY_DONE;
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index 055aaf5ed9af..ff358269aa9c 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -73,11 +73,8 @@ struct can_priv {
#ifdef CONFIG_CAN_LEDS
struct led_trigger *tx_led_trig;
- char tx_led_trig_name[CAN_LED_NAME_SZ];
struct led_trigger *rx_led_trig;
- char rx_led_trig_name[CAN_LED_NAME_SZ];
struct led_trigger *rxtx_led_trig;
- char rxtx_led_trig_name[CAN_LED_NAME_SZ];
#endif
};
--
2.17.0
next prev parent reply other threads:[~2018-05-08 10:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-08 10:05 [PATCH v3 0/3] led_trigger_register_format and tty triggers Uwe Kleine-König
2018-05-08 10:05 ` [PATCH v3 1/3] leds: triggers: provide led_trigger_register_format() Uwe Kleine-König
2018-05-08 19:33 ` Jacek Anaszewski
2018-05-08 20:17 ` Uwe Kleine-König
2018-05-09 19:57 ` Jacek Anaszewski
2018-05-10 11:21 ` Pavel Machek
2018-05-10 11:22 ` Pavel Machek
2018-05-12 18:59 ` Uwe Kleine-König
2018-05-13 14:34 ` Andy Shevchenko
2018-05-08 10:05 ` Uwe Kleine-König [this message]
2018-05-08 11:04 ` [PATCH v3 2/3] can: simplify LED trigger handling Marc Kleine-Budde
2018-05-08 10:05 ` [PATCH v3 3/3] tty: implement led triggers Uwe Kleine-König
2018-05-08 10:08 ` Johan Hovold
2018-05-08 10:51 ` Uwe Kleine-König
2018-05-13 14:23 ` Andy Shevchenko
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=20180508100543.12559-3-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=f.fainelli@gmail.com \
--cc=gnomes@lxorguk.ukuu.org.uk \
--cc=gregkh@linuxfoundation.org \
--cc=jacek.anaszewski@gmail.com \
--cc=johan@kernel.org \
--cc=jslaby@suse.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=pavel@ucw.cz \
--cc=robin.murphy@arm.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).