aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-07-24 03:36:29 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-03 22:54:56 -0500
commitd161a13f974c72fd7ff0069d39a3ae57cb5694ff (patch)
tree0c6d6237b3eafbe362798d7727a02f509fd72ca9 /drivers/platform
parent587a1f1659e8b330b8738ef4901832a2b63f0bed (diff)
switch procfs to umode_t use
both proc_dir_entry ->mode and populating functions Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/asus_acpi.c4
-rw-r--r--drivers/platform/x86/thinkpad_acpi.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
index d9312b3073e5..6f966d6c062b 100644
--- a/drivers/platform/x86/asus_acpi.c
+++ b/drivers/platform/x86/asus_acpi.c
@@ -1053,7 +1053,7 @@ static const struct file_operations disp_proc_fops = {
1053}; 1053};
1054 1054
1055static int 1055static int
1056asus_proc_add(char *name, const struct file_operations *proc_fops, mode_t mode, 1056asus_proc_add(char *name, const struct file_operations *proc_fops, umode_t mode,
1057 struct acpi_device *device) 1057 struct acpi_device *device)
1058{ 1058{
1059 struct proc_dir_entry *proc; 1059 struct proc_dir_entry *proc;
@@ -1072,7 +1072,7 @@ asus_proc_add(char *name, const struct file_operations *proc_fops, mode_t mode,
1072static int asus_hotk_add_fs(struct acpi_device *device) 1072static int asus_hotk_add_fs(struct acpi_device *device)
1073{ 1073{
1074 struct proc_dir_entry *proc; 1074 struct proc_dir_entry *proc;
1075 mode_t mode; 1075 umode_t mode;
1076 1076
1077 if ((asus_uid == 0) && (asus_gid == 0)) { 1077 if ((asus_uid == 0) && (asus_gid == 0)) {
1078 mode = S_IFREG | S_IRUGO | S_IWUSR | S_IWGRP; 1078 mode = S_IFREG | S_IRUGO | S_IWUSR | S_IWGRP;
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 7b828680b21d..455e1522253e 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -297,7 +297,7 @@ struct ibm_init_struct {
297 char param[32]; 297 char param[32];
298 298
299 int (*init) (struct ibm_init_struct *); 299 int (*init) (struct ibm_init_struct *);
300 mode_t base_procfs_mode; 300 umode_t base_procfs_mode;
301 struct ibm_struct *data; 301 struct ibm_struct *data;
302}; 302};
303 303
@@ -8542,7 +8542,7 @@ static int __init ibm_init(struct ibm_init_struct *iibm)
8542 "%s installed\n", ibm->name); 8542 "%s installed\n", ibm->name);
8543 8543
8544 if (ibm->read) { 8544 if (ibm->read) {
8545 mode_t mode = iibm->base_procfs_mode; 8545 umode_t mode = iibm->base_procfs_mode;
8546 8546
8547 if (!mode) 8547 if (!mode)
8548 mode = S_IRUGO; 8548 mode = S_IRUGO;