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

From: Trent Piepho
Date: Thu Sep 25 2008 - 19:48:59 EST


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@xxxxxxxxxxxxx>
CC: NeilBrown <neilb@xxxxxxx>
---
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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/