From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
To: "Pavel Machek" <pavel@ucw.cz>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Jacek Anaszewski" <jacek.anaszewski@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
linux-leds@vger.kernel.org
Subject: [PATCH 2/4] leds: netdev trigger: factor out middle part of device_name_store
Date: Wed, 13 Mar 2019 21:26:13 +0100 [thread overview]
Message-ID: <20190313202615.22883-3-linux@rasmusvillemoes.dk> (raw)
In-Reply-To: <20190313202615.22883-1-linux@rasmusvillemoes.dk>
Take the part of device_name_store that puts the old device (if any),
copies the new device name, looks the name up etc. into a separate
helper function. This is preparation for using that helper from a
function that will initialize the led_netdev_data from a device tree
node. No functional change.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
---
drivers/leds/trigger/ledtrig-netdev.c | 30 ++++++++++++++++-----------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c
index ddc2b90ad7ec..55153a7e8433 100644
--- a/drivers/leds/trigger/ledtrig-netdev.c
+++ b/drivers/leds/trigger/ledtrig-netdev.c
@@ -104,19 +104,9 @@ static ssize_t device_name_show(struct device *dev,
return len;
}
-static ssize_t device_name_store(struct device *dev,
- struct device_attribute *attr, const char *buf,
- size_t size)
+static void set_device(struct led_netdev_data *trigger_data,
+ const char *buf, size_t size)
{
- struct led_netdev_data *trigger_data = led_trigger_get_drvdata(dev);
-
- if (size >= IFNAMSIZ)
- return -EINVAL;
-
- cancel_delayed_work_sync(&trigger_data->work);
-
- spin_lock_bh(&trigger_data->lock);
-
if (trigger_data->net_dev) {
dev_put(trigger_data->net_dev);
trigger_data->net_dev = NULL;
@@ -137,6 +127,22 @@ static ssize_t device_name_store(struct device *dev,
set_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode);
trigger_data->last_activity = 0;
+}
+
+static ssize_t device_name_store(struct device *dev,
+ struct device_attribute *attr, const char *buf,
+ size_t size)
+{
+ struct led_netdev_data *trigger_data = led_trigger_get_drvdata(dev);
+
+ if (size >= IFNAMSIZ)
+ return -EINVAL;
+
+ cancel_delayed_work_sync(&trigger_data->work);
+
+ spin_lock_bh(&trigger_data->lock);
+
+ set_device(trigger_data, buf, size);
set_baseline_state(trigger_data);
spin_unlock_bh(&trigger_data->lock);
--
2.20.1
next prev parent reply other threads:[~2019-03-13 20:26 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-11 10:59 replacement for CAN_LEDS Rasmus Villemoes
2019-03-11 14:42 ` Pavel Machek
2019-03-13 20:26 ` [PATCH 0/4] leds: netdev trigger: allow setting initial values in device tree Rasmus Villemoes
2019-03-13 20:26 ` [PATCH 1/4] leds: netdev trigger: use memcpy in device_name_store Rasmus Villemoes
2019-03-14 9:29 ` Uwe Kleine-König
2019-03-14 9:57 ` Rasmus Villemoes
2019-03-14 10:04 ` Uwe Kleine-König
2019-03-14 10:14 ` Pavel Machek
2019-03-14 10:54 ` Rasmus Villemoes
2019-03-14 12:16 ` Pavel Machek
2019-03-13 20:26 ` Rasmus Villemoes [this message]
2019-03-14 9:31 ` [PATCH 2/4] leds: netdev trigger: factor out middle part of device_name_store Uwe Kleine-König
2019-03-14 9:57 ` Rasmus Villemoes
2019-03-14 10:15 ` Pavel Machek
2019-03-14 10:20 ` Uwe Kleine-König
2019-03-13 20:26 ` [PATCH 3/4] leds: netdev trigger: add documentation to leds/common.txt Rasmus Villemoes
2019-03-13 20:26 ` [PATCH 4/4] leds: netdev trigger: allow setting initial values in device tree Rasmus Villemoes
2019-03-14 9:36 ` Uwe Kleine-König
2019-03-14 10:28 ` Rasmus Villemoes
2019-03-14 10:29 ` Pavel Machek
2019-03-14 11:26 ` Rasmus Villemoes
2019-03-14 12:00 ` Pavel Machek
2019-03-14 13:19 ` Rasmus Villemoes
2019-03-17 19:11 ` Pavel Machek
2019-03-24 20:39 ` Rasmus Villemoes
2019-03-14 10:32 ` Jacek Anaszewski
2019-03-14 14:06 ` [PATCH v2 0/6] " Rasmus Villemoes
2019-03-14 14:06 ` [PATCH v2 1/6] leds: netdev trigger: use memcpy in device_name_store Rasmus Villemoes
2019-03-18 11:20 ` Pavel Machek
2019-03-26 19:53 ` Jacek Anaszewski
2019-03-27 15:26 ` Rasmus Villemoes
2019-03-27 21:20 ` Jacek Anaszewski
2019-03-27 21:31 ` Rasmus Villemoes
2019-03-27 21:45 ` Jacek Anaszewski
2019-03-14 14:06 ` [PATCH v2 2/6] leds: netdev trigger: factor out middle part of device_name_store Rasmus Villemoes
2019-03-18 11:24 ` Pavel Machek
2019-03-14 14:06 ` [PATCH v2 3/6] leds: netdev trigger: move newline handling back to device_name_store Rasmus Villemoes
2019-03-18 11:25 ` Pavel Machek
2019-03-14 14:06 ` [PATCH v2 4/6] leds: netdev trigger: move name length checking to netdev_trig_set_device Rasmus Villemoes
2019-03-18 11:26 ` Pavel Machek
2019-03-14 14:06 ` [PATCH v2 5/6] leds: netdev trigger: add documentation to leds/common.txt Rasmus Villemoes
2019-03-14 14:06 ` [PATCH v2 6/6] leds: netdev trigger: allow setting initial values in device tree Rasmus Villemoes
2019-03-14 14:24 ` Jacek Anaszewski
2019-03-14 15:05 ` Rasmus Villemoes
2019-03-14 15:36 ` Jacek Anaszewski
2019-03-18 11:54 ` Pavel Machek
2019-03-28 16:28 ` Rob Herring
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=20190313202615.22883-3-linux@rasmusvillemoes.dk \
--to=linux@rasmusvillemoes.dk \
--cc=jacek.anaszewski@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=u.kleine-koenig@pengutronix.de \
/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
all inboxes | Powered by JetHome®