summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrent Piepho <tpiepho@freescale.com>2008-09-25 16:45:13 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-16 09:24:51 -0700
commit8c0e3998f5b71e68fe6b6e489a92e052715e563c (patch)
treedf57b05090964df2138c8b59d3796c8509e92ed5
parentd8bf254089a6c31d7d01a4d1d2f1861662900855 (diff)
downloadlinux-3.10-8c0e3998f5b71e68fe6b6e489a92e052715e563c.tar.gz
linux-3.10-8c0e3998f5b71e68fe6b6e489a92e052715e563c.tar.bz2
linux-3.10-8c0e3998f5b71e68fe6b6e489a92e052715e563c.zip
sysfs: Make dir and name args to sysfs_notify() const
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: Neil Brown <neilb@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--fs/sysfs/file.c2
-rw-r--r--include/linux/sysfs.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index d0d79e6b6d1..1f4a3f87726 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -469,7 +469,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
}
EXPORT_SYMBOL_GPL(sysfs_notify_dirent);
-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 d8e0230f1e6..b330e289d71 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -119,7 +119,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);
void sysfs_notify_dirent(struct sysfs_dirent *sd);
struct sysfs_dirent *sysfs_get_dirent(struct sysfs_dirent *parent_sd,
const unsigned char *name);
@@ -229,7 +229,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)
{
}
static inline void sysfs_notify_dirent(struct sysfs_dirent *sd)