Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48176a97 authored by Al Viro's avatar Al Viro
Browse files

switch sysfs_chmod_file() to umode_t 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d161a13f

drivers/hwmon/dme1737.c

+3 −3
Original line number Diff line number Diff line
@@ -1223,7 +1223,7 @@ static ssize_t show_pwm(struct device *dev, struct device_attribute *attr, 
}



static struct attribute *dme1737_pwm_chmod_attr[];

static void dme1737_chmod_file(struct device*, struct attribute*, mode_t);

static void dme1737_chmod_file(struct device*, struct attribute*, umode_t);



static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,

		       const char *buf, size_t count)
@@ -1961,7 +1961,7 @@ static inline void dme1737_sio_outb(int sio_cip, int reg, int val) 
static int dme1737_i2c_get_features(int, struct dme1737_data*);



static void dme1737_chmod_file(struct device *dev,

			       struct attribute *attr, mode_t mode)

			       struct attribute *attr, umode_t mode)

{

	if (sysfs_chmod_file(&dev->kobj, attr, mode)) {

		dev_warn(dev, "Failed to change permissions of %s.\n",
@@ -1971,7 +1971,7 @@ static void dme1737_chmod_file(struct device *dev, 


static void dme1737_chmod_group(struct device *dev,

				const struct attribute_group *group,

				mode_t mode)

				umode_t mode)

{

	struct attribute **attr;

fs/sysfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ EXPORT_SYMBOL_GPL(sysfs_add_file_to_group); 
 *

 */

int sysfs_chmod_file(struct kobject *kobj, const struct attribute *attr,

		     mode_t mode)

		     umode_t mode)

{

	struct sysfs_dirent *sd;

	struct iattr newattrs;

include/linux/sysfs.h

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ int __must_check sysfs_create_file(struct kobject *kobj, 
int __must_check sysfs_create_files(struct kobject *kobj,

				   const struct attribute **attr);

int __must_check sysfs_chmod_file(struct kobject *kobj,

				  const struct attribute *attr, mode_t mode);

				  const struct attribute *attr, umode_t mode);

void sysfs_remove_file(struct kobject *kobj, const struct attribute *attr);

void sysfs_remove_files(struct kobject *kobj, const struct attribute **attr);
@@ -221,7 +221,7 @@ static inline int sysfs_create_files(struct kobject *kobj, 
}



static inline int sysfs_chmod_file(struct kobject *kobj,

				   const struct attribute *attr, mode_t mode)

				   const struct attribute *attr, umode_t mode)

{

	return 0;

}