diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-24 03:40:40 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:54:56 -0500 |
commit | 48176a973d65572e61d0ce95495e5072887e6fb6 (patch) | |
tree | b6e930272851a2d15690d6841b7ae3a9f4f04760 | |
parent | d161a13f974c72fd7ff0069d39a3ae57cb5694ff (diff) |
switch sysfs_chmod_file() to umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | drivers/hwmon/dme1737.c | 6 | ||||
-rw-r--r-- | fs/sysfs/file.c | 2 | ||||
-rw-r--r-- | include/linux/sysfs.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c index d9c592713919..d9803958e49f 100644 --- a/drivers/hwmon/dme1737.c +++ b/drivers/hwmon/dme1737.c | |||
@@ -1223,7 +1223,7 @@ static ssize_t show_pwm(struct device *dev, struct device_attribute *attr, | |||
1223 | } | 1223 | } |
1224 | 1224 | ||
1225 | static struct attribute *dme1737_pwm_chmod_attr[]; | 1225 | static struct attribute *dme1737_pwm_chmod_attr[]; |
1226 | static void dme1737_chmod_file(struct device*, struct attribute*, mode_t); | 1226 | static void dme1737_chmod_file(struct device*, struct attribute*, umode_t); |
1227 | 1227 | ||
1228 | static ssize_t set_pwm(struct device *dev, struct device_attribute *attr, | 1228 | static ssize_t set_pwm(struct device *dev, struct device_attribute *attr, |
1229 | const char *buf, size_t count) | 1229 | const char *buf, size_t count) |
@@ -1961,7 +1961,7 @@ static inline void dme1737_sio_outb(int sio_cip, int reg, int val) | |||
1961 | static int dme1737_i2c_get_features(int, struct dme1737_data*); | 1961 | static int dme1737_i2c_get_features(int, struct dme1737_data*); |
1962 | 1962 | ||
1963 | static void dme1737_chmod_file(struct device *dev, | 1963 | static void dme1737_chmod_file(struct device *dev, |
1964 | struct attribute *attr, mode_t mode) | 1964 | struct attribute *attr, umode_t mode) |
1965 | { | 1965 | { |
1966 | if (sysfs_chmod_file(&dev->kobj, attr, mode)) { | 1966 | if (sysfs_chmod_file(&dev->kobj, attr, mode)) { |
1967 | dev_warn(dev, "Failed to change permissions of %s.\n", | 1967 | dev_warn(dev, "Failed to change permissions of %s.\n", |
@@ -1971,7 +1971,7 @@ static void dme1737_chmod_file(struct device *dev, | |||
1971 | 1971 | ||
1972 | static void dme1737_chmod_group(struct device *dev, | 1972 | static void dme1737_chmod_group(struct device *dev, |
1973 | const struct attribute_group *group, | 1973 | const struct attribute_group *group, |
1974 | mode_t mode) | 1974 | umode_t mode) |
1975 | { | 1975 | { |
1976 | struct attribute **attr; | 1976 | struct attribute **attr; |
1977 | 1977 | ||
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index d4e6080b4b20..120c3adff6b0 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c | |||
@@ -618,7 +618,7 @@ EXPORT_SYMBOL_GPL(sysfs_add_file_to_group); | |||
618 | * | 618 | * |
619 | */ | 619 | */ |
620 | int sysfs_chmod_file(struct kobject *kobj, const struct attribute *attr, | 620 | int sysfs_chmod_file(struct kobject *kobj, const struct attribute *attr, |
621 | mode_t mode) | 621 | umode_t mode) |
622 | { | 622 | { |
623 | struct sysfs_dirent *sd; | 623 | struct sysfs_dirent *sd; |
624 | struct iattr newattrs; | 624 | struct iattr newattrs; |
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index e90eea7afb4e..0010009b2f00 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h | |||
@@ -133,7 +133,7 @@ int __must_check sysfs_create_file(struct kobject *kobj, | |||
133 | int __must_check sysfs_create_files(struct kobject *kobj, | 133 | int __must_check sysfs_create_files(struct kobject *kobj, |
134 | const struct attribute **attr); | 134 | const struct attribute **attr); |
135 | int __must_check sysfs_chmod_file(struct kobject *kobj, | 135 | int __must_check sysfs_chmod_file(struct kobject *kobj, |
136 | const struct attribute *attr, mode_t mode); | 136 | const struct attribute *attr, umode_t mode); |
137 | void sysfs_remove_file(struct kobject *kobj, const struct attribute *attr); | 137 | void sysfs_remove_file(struct kobject *kobj, const struct attribute *attr); |
138 | void sysfs_remove_files(struct kobject *kobj, const struct attribute **attr); | 138 | void sysfs_remove_files(struct kobject *kobj, const struct attribute **attr); |
139 | 139 | ||
@@ -221,7 +221,7 @@ static inline int sysfs_create_files(struct kobject *kobj, | |||
221 | } | 221 | } |
222 | 222 | ||
223 | static inline int sysfs_chmod_file(struct kobject *kobj, | 223 | static inline int sysfs_chmod_file(struct kobject *kobj, |
224 | const struct attribute *attr, mode_t mode) | 224 | const struct attribute *attr, umode_t mode) |
225 | { | 225 | { |
226 | return 0; | 226 | return 0; |
227 | } | 227 | } |