[PATCH] sysfs: Make dir and name args to sysfs_notify() const

Previous thread: Re: [PATCH HACK] powerpc: quick hack to get a functional eHEA with hardirq preemption by Milton Miller on Thursday, September 25, 2008 - 4:40 pm. (2 messages)

Next thread: [PATCH 2.6.28 1/1] cxgb3 - fix race in EEH by Divy Le Ray on Thursday, September 25, 2008 - 5:05 pm. (3 messages)
From: Trent Piepho
Date: Thursday, September 25, 2008 - 4:45 pm

Because they can be, and because code like this produces a warning if
they're not:

struct device_attribute dev_attr;

sysfs_notify(&kobj, NULL, dev_attr.attr.name);

Signed-off-by: Trent Piepho <tpiepho@freescale.com>
CC: NeilBrown <neilb@suse.de>
---
 fs/sysfs/file.c       |    2 +-
 include/linux/sysfs.h |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index c9e4e50..cabfd0f 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -440,7 +440,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
 	return POLLERR|POLLPRI;
 }
 
-void sysfs_notify(struct kobject *k, char *dir, char *attr)
+void sysfs_notify(struct kobject *k, const char *dir, const char *attr)
 {
 	struct sysfs_dirent *sd = k->sd;
 
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 37fa241..94e835f 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -117,7 +117,7 @@ int sysfs_add_file_to_group(struct kobject *kobj,
 void sysfs_remove_file_from_group(struct kobject *kobj,
 			const struct attribute *attr, const char *group);
 
-void sysfs_notify(struct kobject *kobj, char *dir, char *attr);
+void sysfs_notify(struct kobject *kobj, const char *dir, const char *attr);
 
 extern int __must_check sysfs_init(void);
 
@@ -222,7 +222,8 @@ static inline void sysfs_remove_file_from_group(struct kobject *kobj,
 {
 }
 
-static inline void sysfs_notify(struct kobject *kobj, char *dir, char *attr)
+static inline void sysfs_notify(struct kobject *kobj, const char *dir,
+				const char *attr)
 {
 }
 
-- 
1.5.4.1

--

Previous thread: Re: [PATCH HACK] powerpc: quick hack to get a functional eHEA with hardirq preemption by Milton Miller on Thursday, September 25, 2008 - 4:40 pm. (2 messages)

Next thread: [PATCH 2.6.28 1/1] cxgb3 - fix race in EEH by Divy Le Ray on Thursday, September 25, 2008 - 5:05 pm. (3 messages)