diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2009-01-11 18:07:55 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-04-03 23:14:40 -0400 |
commit | 070d8eb1f6b789206486ea6a4a1bb7745d86d314 (patch) | |
tree | 08adf0215ee2f76a26adca7ff90e449d02acee22 | |
parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) |
ACPI: constify VFTs (1/2)
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | drivers/acpi/battery.c | 2 | ||||
-rw-r--r-- | drivers/acpi/ec.c | 2 | ||||
-rw-r--r-- | drivers/acpi/processor_thermal.c | 2 | ||||
-rw-r--r-- | drivers/acpi/processor_throttling.c | 2 | ||||
-rw-r--r-- | drivers/acpi/sbs.c | 14 | ||||
-rw-r--r-- | drivers/acpi/video.c | 10 | ||||
-rw-r--r-- | include/acpi/processor.h | 4 |
7 files changed, 18 insertions, 18 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 69cbc57c2d1c..4d11b0704d5f 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
@@ -740,7 +740,7 @@ DECLARE_FILE_FUNCTIONS(alarm); | |||
740 | static struct battery_file { | 740 | static struct battery_file { |
741 | struct file_operations ops; | 741 | struct file_operations ops; |
742 | mode_t mode; | 742 | mode_t mode; |
743 | char *name; | 743 | const char *name; |
744 | } acpi_battery_file[] = { | 744 | } acpi_battery_file[] = { |
745 | FILE_DESCRIPTION_RO(info), | 745 | FILE_DESCRIPTION_RO(info), |
746 | FILE_DESCRIPTION_RO(state), | 746 | FILE_DESCRIPTION_RO(state), |
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 2fe15060dcdc..1ec61e52b390 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -672,7 +672,7 @@ static int acpi_ec_info_open_fs(struct inode *inode, struct file *file) | |||
672 | return single_open(file, acpi_ec_read_info, PDE(inode)->data); | 672 | return single_open(file, acpi_ec_read_info, PDE(inode)->data); |
673 | } | 673 | } |
674 | 674 | ||
675 | static struct file_operations acpi_ec_info_ops = { | 675 | static const struct file_operations acpi_ec_info_ops = { |
676 | .open = acpi_ec_info_open_fs, | 676 | .open = acpi_ec_info_open_fs, |
677 | .read = seq_read, | 677 | .read = seq_read, |
678 | .llseek = seq_lseek, | 678 | .llseek = seq_lseek, |
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c index b1eb376fae45..1f31699359ba 100644 --- a/drivers/acpi/processor_thermal.c +++ b/drivers/acpi/processor_thermal.c | |||
@@ -507,7 +507,7 @@ static ssize_t acpi_processor_write_limit(struct file * file, | |||
507 | return count; | 507 | return count; |
508 | } | 508 | } |
509 | 509 | ||
510 | struct file_operations acpi_processor_limit_fops = { | 510 | const struct file_operations acpi_processor_limit_fops = { |
511 | .owner = THIS_MODULE, | 511 | .owner = THIS_MODULE, |
512 | .open = acpi_processor_limit_open_fs, | 512 | .open = acpi_processor_limit_open_fs, |
513 | .read = seq_read, | 513 | .read = seq_read, |
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c index d27838171f4a..73aed5f5b973 100644 --- a/drivers/acpi/processor_throttling.c +++ b/drivers/acpi/processor_throttling.c | |||
@@ -1291,7 +1291,7 @@ static ssize_t acpi_processor_write_throttling(struct file *file, | |||
1291 | return count; | 1291 | return count; |
1292 | } | 1292 | } |
1293 | 1293 | ||
1294 | struct file_operations acpi_processor_throttling_fops = { | 1294 | const struct file_operations acpi_processor_throttling_fops = { |
1295 | .owner = THIS_MODULE, | 1295 | .owner = THIS_MODULE, |
1296 | .open = acpi_processor_throttling_open_fs, | 1296 | .open = acpi_processor_throttling_open_fs, |
1297 | .read = seq_read, | 1297 | .read = seq_read, |
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index 6050ce481873..1e3cf989196b 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c | |||
@@ -479,9 +479,9 @@ static int | |||
479 | acpi_sbs_add_fs(struct proc_dir_entry **dir, | 479 | acpi_sbs_add_fs(struct proc_dir_entry **dir, |
480 | struct proc_dir_entry *parent_dir, | 480 | struct proc_dir_entry *parent_dir, |
481 | char *dir_name, | 481 | char *dir_name, |
482 | struct file_operations *info_fops, | 482 | const struct file_operations *info_fops, |
483 | struct file_operations *state_fops, | 483 | const struct file_operations *state_fops, |
484 | struct file_operations *alarm_fops, void *data) | 484 | const struct file_operations *alarm_fops, void *data) |
485 | { | 485 | { |
486 | if (!*dir) { | 486 | if (!*dir) { |
487 | *dir = proc_mkdir(dir_name, parent_dir); | 487 | *dir = proc_mkdir(dir_name, parent_dir); |
@@ -677,7 +677,7 @@ static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file) | |||
677 | return single_open(file, acpi_battery_read_alarm, PDE(inode)->data); | 677 | return single_open(file, acpi_battery_read_alarm, PDE(inode)->data); |
678 | } | 678 | } |
679 | 679 | ||
680 | static struct file_operations acpi_battery_info_fops = { | 680 | static const struct file_operations acpi_battery_info_fops = { |
681 | .open = acpi_battery_info_open_fs, | 681 | .open = acpi_battery_info_open_fs, |
682 | .read = seq_read, | 682 | .read = seq_read, |
683 | .llseek = seq_lseek, | 683 | .llseek = seq_lseek, |
@@ -685,7 +685,7 @@ static struct file_operations acpi_battery_info_fops = { | |||
685 | .owner = THIS_MODULE, | 685 | .owner = THIS_MODULE, |
686 | }; | 686 | }; |
687 | 687 | ||
688 | static struct file_operations acpi_battery_state_fops = { | 688 | static const struct file_operations acpi_battery_state_fops = { |
689 | .open = acpi_battery_state_open_fs, | 689 | .open = acpi_battery_state_open_fs, |
690 | .read = seq_read, | 690 | .read = seq_read, |
691 | .llseek = seq_lseek, | 691 | .llseek = seq_lseek, |
@@ -693,7 +693,7 @@ static struct file_operations acpi_battery_state_fops = { | |||
693 | .owner = THIS_MODULE, | 693 | .owner = THIS_MODULE, |
694 | }; | 694 | }; |
695 | 695 | ||
696 | static struct file_operations acpi_battery_alarm_fops = { | 696 | static const struct file_operations acpi_battery_alarm_fops = { |
697 | .open = acpi_battery_alarm_open_fs, | 697 | .open = acpi_battery_alarm_open_fs, |
698 | .read = seq_read, | 698 | .read = seq_read, |
699 | .write = acpi_battery_write_alarm, | 699 | .write = acpi_battery_write_alarm, |
@@ -725,7 +725,7 @@ static int acpi_ac_state_open_fs(struct inode *inode, struct file *file) | |||
725 | return single_open(file, acpi_ac_read_state, PDE(inode)->data); | 725 | return single_open(file, acpi_ac_read_state, PDE(inode)->data); |
726 | } | 726 | } |
727 | 727 | ||
728 | static struct file_operations acpi_ac_state_fops = { | 728 | static const struct file_operations acpi_ac_state_fops = { |
729 | .open = acpi_ac_state_open_fs, | 729 | .open = acpi_ac_state_open_fs, |
730 | .read = seq_read, | 730 | .read = seq_read, |
731 | .llseek = seq_lseek, | 731 | .llseek = seq_lseek, |
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index bb5ed059114a..65c3073a1dcb 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
@@ -189,7 +189,7 @@ struct acpi_video_device { | |||
189 | 189 | ||
190 | /* bus */ | 190 | /* bus */ |
191 | static int acpi_video_bus_info_open_fs(struct inode *inode, struct file *file); | 191 | static int acpi_video_bus_info_open_fs(struct inode *inode, struct file *file); |
192 | static struct file_operations acpi_video_bus_info_fops = { | 192 | static const struct file_operations acpi_video_bus_info_fops = { |
193 | .owner = THIS_MODULE, | 193 | .owner = THIS_MODULE, |
194 | .open = acpi_video_bus_info_open_fs, | 194 | .open = acpi_video_bus_info_open_fs, |
195 | .read = seq_read, | 195 | .read = seq_read, |
@@ -198,7 +198,7 @@ static struct file_operations acpi_video_bus_info_fops = { | |||
198 | }; | 198 | }; |
199 | 199 | ||
200 | static int acpi_video_bus_ROM_open_fs(struct inode *inode, struct file *file); | 200 | static int acpi_video_bus_ROM_open_fs(struct inode *inode, struct file *file); |
201 | static struct file_operations acpi_video_bus_ROM_fops = { | 201 | static const struct file_operations acpi_video_bus_ROM_fops = { |
202 | .owner = THIS_MODULE, | 202 | .owner = THIS_MODULE, |
203 | .open = acpi_video_bus_ROM_open_fs, | 203 | .open = acpi_video_bus_ROM_open_fs, |
204 | .read = seq_read, | 204 | .read = seq_read, |
@@ -208,7 +208,7 @@ static struct file_operations acpi_video_bus_ROM_fops = { | |||
208 | 208 | ||
209 | static int acpi_video_bus_POST_info_open_fs(struct inode *inode, | 209 | static int acpi_video_bus_POST_info_open_fs(struct inode *inode, |
210 | struct file *file); | 210 | struct file *file); |
211 | static struct file_operations acpi_video_bus_POST_info_fops = { | 211 | static const struct file_operations acpi_video_bus_POST_info_fops = { |
212 | .owner = THIS_MODULE, | 212 | .owner = THIS_MODULE, |
213 | .open = acpi_video_bus_POST_info_open_fs, | 213 | .open = acpi_video_bus_POST_info_open_fs, |
214 | .read = seq_read, | 214 | .read = seq_read, |
@@ -237,7 +237,7 @@ static struct file_operations acpi_video_bus_DOS_fops = { | |||
237 | /* device */ | 237 | /* device */ |
238 | static int acpi_video_device_info_open_fs(struct inode *inode, | 238 | static int acpi_video_device_info_open_fs(struct inode *inode, |
239 | struct file *file); | 239 | struct file *file); |
240 | static struct file_operations acpi_video_device_info_fops = { | 240 | static const struct file_operations acpi_video_device_info_fops = { |
241 | .owner = THIS_MODULE, | 241 | .owner = THIS_MODULE, |
242 | .open = acpi_video_device_info_open_fs, | 242 | .open = acpi_video_device_info_open_fs, |
243 | .read = seq_read, | 243 | .read = seq_read, |
@@ -267,7 +267,7 @@ static struct file_operations acpi_video_device_brightness_fops = { | |||
267 | 267 | ||
268 | static int acpi_video_device_EDID_open_fs(struct inode *inode, | 268 | static int acpi_video_device_EDID_open_fs(struct inode *inode, |
269 | struct file *file); | 269 | struct file *file); |
270 | static struct file_operations acpi_video_device_EDID_fops = { | 270 | static const struct file_operations acpi_video_device_EDID_fops = { |
271 | .owner = THIS_MODULE, | 271 | .owner = THIS_MODULE, |
272 | .open = acpi_video_device_EDID_open_fs, | 272 | .open = acpi_video_device_EDID_open_fs, |
273 | .read = seq_read, | 273 | .read = seq_read, |
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 0574add2a1e3..b09c4fde9725 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
@@ -322,7 +322,7 @@ static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr) | |||
322 | int acpi_processor_tstate_has_changed(struct acpi_processor *pr); | 322 | int acpi_processor_tstate_has_changed(struct acpi_processor *pr); |
323 | int acpi_processor_get_throttling_info(struct acpi_processor *pr); | 323 | int acpi_processor_get_throttling_info(struct acpi_processor *pr); |
324 | extern int acpi_processor_set_throttling(struct acpi_processor *pr, int state); | 324 | extern int acpi_processor_set_throttling(struct acpi_processor *pr, int state); |
325 | extern struct file_operations acpi_processor_throttling_fops; | 325 | extern const struct file_operations acpi_processor_throttling_fops; |
326 | extern void acpi_processor_throttling_init(void); | 326 | extern void acpi_processor_throttling_init(void); |
327 | /* in processor_idle.c */ | 327 | /* in processor_idle.c */ |
328 | int acpi_processor_power_init(struct acpi_processor *pr, | 328 | int acpi_processor_power_init(struct acpi_processor *pr, |
@@ -336,7 +336,7 @@ extern struct cpuidle_driver acpi_idle_driver; | |||
336 | 336 | ||
337 | /* in processor_thermal.c */ | 337 | /* in processor_thermal.c */ |
338 | int acpi_processor_get_limit_info(struct acpi_processor *pr); | 338 | int acpi_processor_get_limit_info(struct acpi_processor *pr); |
339 | extern struct file_operations acpi_processor_limit_fops; | 339 | extern const struct file_operations acpi_processor_limit_fops; |
340 | extern struct thermal_cooling_device_ops processor_cooling_ops; | 340 | extern struct thermal_cooling_device_ops processor_cooling_ops; |
341 | #ifdef CONFIG_CPU_FREQ | 341 | #ifdef CONFIG_CPU_FREQ |
342 | void acpi_thermal_cpufreq_init(void); | 342 | void acpi_thermal_cpufreq_init(void); |