diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 20:51:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 20:51:54 -0400 |
commit | 20b4fb485227404329e41ad15588afad3df23050 (patch) | |
tree | f3e099f0ab3da8a93b447203e294d2bb22f6dc05 /drivers/acpi | |
parent | b9394d8a657cd3c064fa432aa0905c1b58b38fe9 (diff) | |
parent | ac3e3c5b1164397656df81b9e9ab4991184d3236 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull VFS updates from Al Viro,
Misc cleanups all over the place, mainly wrt /proc interfaces (switch
create_proc_entry to proc_create(), get rid of the deprecated
create_proc_read_entry() in favor of using proc_create_data() and
seq_file etc).
7kloc removed.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (204 commits)
don't bother with deferred freeing of fdtables
proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h
proc: Make the PROC_I() and PDE() macros internal to procfs
proc: Supply a function to remove a proc entry by PDE
take cgroup_open() and cpuset_open() to fs/proc/base.c
ppc: Clean up scanlog
ppc: Clean up rtas_flash driver somewhat
hostap: proc: Use remove_proc_subtree()
drm: proc: Use remove_proc_subtree()
drm: proc: Use minor->index to label things, not PDE->name
drm: Constify drm_proc_list[]
zoran: Don't print proc_dir_entry data in debug
reiserfs: Don't access the proc_dir_entry in r_open(), r_start() r_show()
proc: Supply an accessor for getting the data from a PDE's parent
airo: Use remove_proc_subtree()
rtl8192u: Don't need to save device proc dir PDE
rtl8187se: Use a dir under /proc/net/r8180/
proc: Add proc_mkdir_data()
proc: Move some bits from linux/proc_fs.h to linux/{of.h,signal.h,tty.h}
proc: Move PDE_NET() to fs/proc/proc_net.c
...
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/ac.c | 2 | ||||
-rw-r--r-- | drivers/acpi/battery.c | 2 | ||||
-rw-r--r-- | drivers/acpi/button.c | 2 | ||||
-rw-r--r-- | drivers/acpi/proc.c | 4 | ||||
-rw-r--r-- | drivers/acpi/sbs.c | 29 |
5 files changed, 13 insertions, 26 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 6d5bf649196d..00d2efd674df 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c | |||
@@ -194,7 +194,7 @@ static int acpi_ac_seq_show(struct seq_file *seq, void *offset) | |||
194 | 194 | ||
195 | static int acpi_ac_open_fs(struct inode *inode, struct file *file) | 195 | static int acpi_ac_open_fs(struct inode *inode, struct file *file) |
196 | { | 196 | { |
197 | return single_open(file, acpi_ac_seq_show, PDE(inode)->data); | 197 | return single_open(file, acpi_ac_seq_show, PDE_DATA(inode)); |
198 | } | 198 | } |
199 | 199 | ||
200 | static int acpi_ac_add_fs(struct acpi_device *device) | 200 | static int acpi_ac_add_fs(struct acpi_device *device) |
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 0cc384b72943..e7100459ac4a 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
@@ -929,7 +929,7 @@ static int acpi_battery_read_##_name(struct seq_file *seq, void *offset) \ | |||
929 | } \ | 929 | } \ |
930 | static int acpi_battery_##_name##_open_fs(struct inode *inode, struct file *file) \ | 930 | static int acpi_battery_##_name##_open_fs(struct inode *inode, struct file *file) \ |
931 | { \ | 931 | { \ |
932 | return single_open(file, acpi_battery_read_##_name, PDE(inode)->data); \ | 932 | return single_open(file, acpi_battery_read_##_name, PDE_DATA(inode)); \ |
933 | } | 933 | } |
934 | 934 | ||
935 | DECLARE_FILE_FUNCTIONS(info); | 935 | DECLARE_FILE_FUNCTIONS(info); |
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index 92a659aa6396..d2e617b5b3f6 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c | |||
@@ -129,7 +129,7 @@ static int acpi_button_state_seq_show(struct seq_file *seq, void *offset) | |||
129 | 129 | ||
130 | static int acpi_button_state_open_fs(struct inode *inode, struct file *file) | 130 | static int acpi_button_state_open_fs(struct inode *inode, struct file *file) |
131 | { | 131 | { |
132 | return single_open(file, acpi_button_state_seq_show, PDE(inode)->data); | 132 | return single_open(file, acpi_button_state_seq_show, PDE_DATA(inode)); |
133 | } | 133 | } |
134 | 134 | ||
135 | static const struct file_operations acpi_button_state_fops = { | 135 | static const struct file_operations acpi_button_state_fops = { |
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c index 52ce76725c20..aa1227a7e3f2 100644 --- a/drivers/acpi/proc.c +++ b/drivers/acpi/proc.c | |||
@@ -120,7 +120,7 @@ static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset) | |||
120 | 120 | ||
121 | static int acpi_system_alarm_open_fs(struct inode *inode, struct file *file) | 121 | static int acpi_system_alarm_open_fs(struct inode *inode, struct file *file) |
122 | { | 122 | { |
123 | return single_open(file, acpi_system_alarm_seq_show, PDE(inode)->data); | 123 | return single_open(file, acpi_system_alarm_seq_show, PDE_DATA(inode)); |
124 | } | 124 | } |
125 | 125 | ||
126 | static int get_date_field(char **p, u32 * value) | 126 | static int get_date_field(char **p, u32 * value) |
@@ -397,7 +397,7 @@ static int | |||
397 | acpi_system_wakeup_device_open_fs(struct inode *inode, struct file *file) | 397 | acpi_system_wakeup_device_open_fs(struct inode *inode, struct file *file) |
398 | { | 398 | { |
399 | return single_open(file, acpi_system_wakeup_device_seq_show, | 399 | return single_open(file, acpi_system_wakeup_device_seq_show, |
400 | PDE(inode)->data); | 400 | PDE_DATA(inode)); |
401 | } | 401 | } |
402 | 402 | ||
403 | static const struct file_operations acpi_system_wakeup_device_fops = { | 403 | static const struct file_operations acpi_system_wakeup_device_fops = { |
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index e523245643ac..b6241eeb1132 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c | |||
@@ -521,19 +521,6 @@ acpi_sbs_add_fs(struct proc_dir_entry **dir, | |||
521 | return 0; | 521 | return 0; |
522 | } | 522 | } |
523 | 523 | ||
524 | static void | ||
525 | acpi_sbs_remove_fs(struct proc_dir_entry **dir, | ||
526 | struct proc_dir_entry *parent_dir) | ||
527 | { | ||
528 | if (*dir) { | ||
529 | remove_proc_entry(ACPI_SBS_FILE_INFO, *dir); | ||
530 | remove_proc_entry(ACPI_SBS_FILE_STATE, *dir); | ||
531 | remove_proc_entry(ACPI_SBS_FILE_ALARM, *dir); | ||
532 | remove_proc_entry((*dir)->name, parent_dir); | ||
533 | *dir = NULL; | ||
534 | } | ||
535 | } | ||
536 | |||
537 | /* Smart Battery Interface */ | 524 | /* Smart Battery Interface */ |
538 | static struct proc_dir_entry *acpi_battery_dir = NULL; | 525 | static struct proc_dir_entry *acpi_battery_dir = NULL; |
539 | 526 | ||
@@ -584,7 +571,7 @@ static int acpi_battery_read_info(struct seq_file *seq, void *offset) | |||
584 | 571 | ||
585 | static int acpi_battery_info_open_fs(struct inode *inode, struct file *file) | 572 | static int acpi_battery_info_open_fs(struct inode *inode, struct file *file) |
586 | { | 573 | { |
587 | return single_open(file, acpi_battery_read_info, PDE(inode)->data); | 574 | return single_open(file, acpi_battery_read_info, PDE_DATA(inode)); |
588 | } | 575 | } |
589 | 576 | ||
590 | static int acpi_battery_read_state(struct seq_file *seq, void *offset) | 577 | static int acpi_battery_read_state(struct seq_file *seq, void *offset) |
@@ -623,7 +610,7 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset) | |||
623 | 610 | ||
624 | static int acpi_battery_state_open_fs(struct inode *inode, struct file *file) | 611 | static int acpi_battery_state_open_fs(struct inode *inode, struct file *file) |
625 | { | 612 | { |
626 | return single_open(file, acpi_battery_read_state, PDE(inode)->data); | 613 | return single_open(file, acpi_battery_read_state, PDE_DATA(inode)); |
627 | } | 614 | } |
628 | 615 | ||
629 | static int acpi_battery_read_alarm(struct seq_file *seq, void *offset) | 616 | static int acpi_battery_read_alarm(struct seq_file *seq, void *offset) |
@@ -688,7 +675,7 @@ acpi_battery_write_alarm(struct file *file, const char __user * buffer, | |||
688 | 675 | ||
689 | static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file) | 676 | static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file) |
690 | { | 677 | { |
691 | return single_open(file, acpi_battery_read_alarm, PDE(inode)->data); | 678 | return single_open(file, acpi_battery_read_alarm, PDE_DATA(inode)); |
692 | } | 679 | } |
693 | 680 | ||
694 | static const struct file_operations acpi_battery_info_fops = { | 681 | static const struct file_operations acpi_battery_info_fops = { |
@@ -736,7 +723,7 @@ static int acpi_ac_read_state(struct seq_file *seq, void *offset) | |||
736 | 723 | ||
737 | static int acpi_ac_state_open_fs(struct inode *inode, struct file *file) | 724 | static int acpi_ac_state_open_fs(struct inode *inode, struct file *file) |
738 | { | 725 | { |
739 | return single_open(file, acpi_ac_read_state, PDE(inode)->data); | 726 | return single_open(file, acpi_ac_read_state, PDE_DATA(inode)); |
740 | } | 727 | } |
741 | 728 | ||
742 | static const struct file_operations acpi_ac_state_fops = { | 729 | static const struct file_operations acpi_ac_state_fops = { |
@@ -836,8 +823,8 @@ static void acpi_battery_remove(struct acpi_sbs *sbs, int id) | |||
836 | power_supply_unregister(&battery->bat); | 823 | power_supply_unregister(&battery->bat); |
837 | } | 824 | } |
838 | #ifdef CONFIG_ACPI_PROCFS_POWER | 825 | #ifdef CONFIG_ACPI_PROCFS_POWER |
839 | if (battery->proc_entry) | 826 | proc_remove(battery->proc_entry); |
840 | acpi_sbs_remove_fs(&battery->proc_entry, acpi_battery_dir); | 827 | battery->proc_entry = NULL; |
841 | #endif | 828 | #endif |
842 | } | 829 | } |
843 | 830 | ||
@@ -873,8 +860,8 @@ static void acpi_charger_remove(struct acpi_sbs *sbs) | |||
873 | if (sbs->charger.dev) | 860 | if (sbs->charger.dev) |
874 | power_supply_unregister(&sbs->charger); | 861 | power_supply_unregister(&sbs->charger); |
875 | #ifdef CONFIG_ACPI_PROCFS_POWER | 862 | #ifdef CONFIG_ACPI_PROCFS_POWER |
876 | if (sbs->charger_entry) | 863 | proc_remove(sbs->charger_entry); |
877 | acpi_sbs_remove_fs(&sbs->charger_entry, acpi_ac_dir); | 864 | sbs->charger_entry = NULL; |
878 | #endif | 865 | #endif |
879 | } | 866 | } |
880 | 867 | ||