From: Takashi Iwai <tiwai@suse.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] driver core: Add device_create_files() and device_remove_files() helpers
Date: Wed, 28 Jan 2015 21:46:13 +0100 [thread overview]
Message-ID: <1422477974-8369-2-git-send-email-tiwai@suse.de> (raw)
In-Reply-To: <1422477974-8369-1-git-send-email-tiwai@suse.de>
There are lots of open codes that call multiple device_create_file()
or device_remove_file() sequentially. This patch provides the helper
functions for such cases to be performed in a shot.
Also, device_create_files() rolls back at the error path, and this
will simplify the error handling code in many drivers, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
drivers/base/core.c | 36 ++++++++++++++++++++++++++++++++++++
include/linux/device.h | 4 ++++
2 files changed, 40 insertions(+)
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 97e2baf6e5d8..d3fa3d55f1fb 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -557,6 +557,29 @@ int device_create_file(struct device *dev,
EXPORT_SYMBOL_GPL(device_create_file);
/**
+ * device_create_files - create multiple sysfs attribute files for device.
+ * @dev: device.
+ * @attr: NULL-terminated list of device attribute descriptors.
+ */
+int device_create_files(struct device *dev,
+ const struct device_attribute **attrs)
+{
+ int i, err;
+
+ for (i = 0; attrs[i]; i++) {
+ err = device_create_file(dev, attrs[i]);
+ if (err) {
+ while (--i >= 0)
+ device_remove_file(dev, attrs[i]);
+ return err;
+ }
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(device_create_files);
+
+/**
* device_remove_file - remove sysfs attribute file.
* @dev: device.
* @attr: device attribute descriptor.
@@ -570,6 +593,19 @@ void device_remove_file(struct device *dev,
EXPORT_SYMBOL_GPL(device_remove_file);
/**
+ * device_remove_file - remove multiple sysfs attribute files.
+ * @dev: device.
+ * @attr: NULL-terminated list of device attribute descriptors.
+ */
+void device_remove_files(struct device *dev,
+ const struct device_attribute **attrs)
+{
+ for (; *attrs; attrs++)
+ device_remove_file(dev, *attrs);
+}
+EXPORT_SYMBOL_GPL(device_remove_files);
+
+/**
* device_remove_file_self - remove sysfs attribute file from its own method.
* @dev: device.
* @attr: device attribute descriptor.
diff --git a/include/linux/device.h b/include/linux/device.h
index fb506738f7b7..45b6cef1a12b 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -559,8 +559,12 @@ ssize_t device_store_bool(struct device *dev, struct device_attribute *attr,
extern int device_create_file(struct device *device,
const struct device_attribute *entry);
+extern int device_create_files(struct device *device,
+ const struct device_attribute **attrs);
extern void device_remove_file(struct device *dev,
const struct device_attribute *attr);
+extern void device_remove_files(struct device *dev,
+ const struct device_attribute **attrs);
extern bool device_remove_file_self(struct device *dev,
const struct device_attribute *attr);
extern int __must_check device_create_bin_file(struct device *dev,
--
2.2.2
next prev parent reply other threads:[~2015-01-28 20:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-28 20:46 [PATCH 0/2] Add device_create_files() and device_remove_files() helpers Takashi Iwai
2015-01-28 20:46 ` Takashi Iwai [this message]
2015-01-28 20:46 ` [PATCH 2/2] drivers/base/node: Use device_create_files() and device_remove_files() Takashi Iwai
2015-01-28 21:06 ` Greg Kroah-Hartman
2015-01-28 21:27 ` Takashi Iwai
2015-01-28 21:05 ` [PATCH 0/2] Add device_create_files() and device_remove_files() helpers Greg Kroah-Hartman
2015-01-28 21:26 ` Takashi Iwai
2015-01-28 21:34 ` Greg Kroah-Hartman
2015-01-28 22:18 ` Takashi Iwai
2015-01-28 22:28 ` Greg Kroah-Hartman
2015-01-28 23:11 ` Takashi Iwai
2015-01-30 4:26 ` Greg Kroah-Hartman
2015-01-30 16:31 ` Takashi Iwai
2015-02-07 10:10 ` Greg Kroah-Hartman
2015-02-08 8:41 ` Takashi Iwai
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=1422477974-8369-2-git-send-email-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/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).