mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: Phil Carmody <ext-phil.2.carmody@nokia.com>,
	Greg Kroah-Hartman <gregkh@suse.de>
Subject: [PATCH 06/10] Driver core: driver_attribute parameters can often be const*
Date: Wed, 23 Dec 2009 11:52:39 -0800	[thread overview]
Message-ID: <1261597963-18323-6-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <20091223194955.GB18101@kroah.com>

From: Phil Carmody <ext-phil.2.carmody@nokia.com>

Many struct driver_attribute descriptors are purely read-only
structures, and there's no need to change them. Therefore make
the promise not to, which will let those descriptors be put in
a ro section.

Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 Documentation/driver-model/driver.txt |    4 ++--
 Documentation/filesystems/sysfs.txt   |    4 ++--
 drivers/base/driver.c                 |    4 ++--
 include/linux/device.h                |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Documentation/driver-model/driver.txt b/Documentation/driver-model/driver.txt
index 60120fb..d2cd6fb 100644
--- a/Documentation/driver-model/driver.txt
+++ b/Documentation/driver-model/driver.txt
@@ -226,5 +226,5 @@ struct driver_attribute driver_attr_debug;
 This can then be used to add and remove the attribute from the
 driver's directory using:
 
-int driver_create_file(struct device_driver *, struct driver_attribute *);
-void driver_remove_file(struct device_driver *, struct driver_attribute *);
+int driver_create_file(struct device_driver *, const struct driver_attribute *);
+void driver_remove_file(struct device_driver *, const struct driver_attribute *);
diff --git a/Documentation/filesystems/sysfs.txt b/Documentation/filesystems/sysfs.txt
index a4ac2b9..931c806 100644
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
@@ -358,7 +358,7 @@ DRIVER_ATTR(_name, _mode, _show, _store)
 
 Creation/Removal:
 
-int driver_create_file(struct device_driver *, struct driver_attribute *);
-void driver_remove_file(struct device_driver *, struct driver_attribute *);
+int driver_create_file(struct device_driver *, const struct driver_attribute *);
+void driver_remove_file(struct device_driver *, const struct driver_attribute *);
 
 
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index f367885..90c9fff 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -98,7 +98,7 @@ EXPORT_SYMBOL_GPL(driver_find_device);
  * @attr: driver attribute descriptor.
  */
 int driver_create_file(struct device_driver *drv,
-		       struct driver_attribute *attr)
+		       const struct driver_attribute *attr)
 {
 	int error;
 	if (drv)
@@ -115,7 +115,7 @@ EXPORT_SYMBOL_GPL(driver_create_file);
  * @attr: driver attribute descriptor.
  */
 void driver_remove_file(struct device_driver *drv,
-			struct driver_attribute *attr)
+			const struct driver_attribute *attr)
 {
 	if (drv)
 		sysfs_remove_file(&drv->p->kobj, &attr->attr);
diff --git a/include/linux/device.h b/include/linux/device.h
index 10d74ce..a62799f 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -166,9 +166,9 @@ struct driver_attribute driver_attr_##_name =		\
 	__ATTR(_name, _mode, _show, _store)
 
 extern int __must_check driver_create_file(struct device_driver *driver,
-					   struct driver_attribute *attr);
+					const struct driver_attribute *attr);
 extern void driver_remove_file(struct device_driver *driver,
-			       struct driver_attribute *attr);
+			       const struct driver_attribute *attr);
 
 extern int __must_check driver_add_kobj(struct device_driver *drv,
 					struct kobject *kobj,
-- 
1.6.5.7


  parent reply	other threads:[~2009-12-23 19:56 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-23 19:49 [GIT PATCH] driver core patches for 2.6.33-git Greg KH
2009-12-23 19:52 ` [PATCH 01/10] devtmpfs: Convert dirlock to a mutex Greg Kroah-Hartman
2009-12-23 19:52 ` [PATCH 02/10] vfs: get_sb_single() - do not pass options twice Greg Kroah-Hartman
2009-12-27 12:36   ` OGAWA Hirofumi
2009-12-30 18:05     ` Kay Sievers
2009-12-30 19:30       ` OGAWA Hirofumi
2009-12-23 19:52 ` [PATCH 03/10] Doc/stable rules: add new cherry-pick logic Greg Kroah-Hartman
2009-12-23 19:52 ` [PATCH 04/10] Driver core: device_attribute parameters can often be const* Greg Kroah-Hartman
2009-12-23 19:52 ` [PATCH 05/10] Driver core: bin_attribute " Greg Kroah-Hartman
2009-12-23 19:52 ` Greg Kroah-Hartman [this message]
2009-12-23 19:52 ` [PATCH 07/10] Driver-core: Fix bogus 0 error return in device_add() Greg Kroah-Hartman
2009-12-23 19:52 ` [PATCH 08/10] driver core: Prevent reference to freed memory on error path Greg Kroah-Hartman
2009-12-23 19:52 ` [PATCH 09/10] Driver core: export platform_device_register_data as a GPL symbol Greg Kroah-Hartman
2009-12-23 19:52 ` [PATCH 10/10] devtmpfs: unlock mutex in case of string allocation error Greg Kroah-Hartman

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=1261597963-18323-6-git-send-email-gregkh@suse.de \
    --to=gregkh@suse.de \
    --cc=ext-phil.2.carmody@nokia.com \
    --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

all inboxes | Powered by JetHome®