acpi: constify ops structs
Subsystems (5)
PATCH 1/1 acpi: constify ops structs
Structs battery_file, acpi_dock_ops, file_operations, thermal_cooling_device_ops, thermal_zone_device_ops, kernel_param_ops are not changed in runtime. It is safe to make them const. register_hotplug_dock_device() was altered to take const "ops" argument to respect acpi_dock_ops' const notion.
---
Len, I think it can be applied as a single patch to acpi tree as the only non-acpi thing is acpi_dock_ops in ata/ and pci/, which is really trivial.
drivers/acpi/battery.c | 2 +- drivers/acpi/dock.c | 4 ++-- drivers/acpi/ec_sys.c | 2 +- drivers/acpi/fan.c | 2 +- drivers/acpi/processor_thermal.c | 2 +- drivers/acpi/sysfs.c | 4 ++-- drivers/acpi/thermal.c | 2 +- drivers/acpi/video.c | 2 +- drivers/ata/libata-acpi.c | 4 ++-- drivers/pci/hotplug/acpiphp_glue.c | 2 +- include/acpi/acpi_drivers.h | 2 +- include/acpi/processor.h | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-)
---
drivers/acpi/battery.c +1 -1
@@ -863,7 +863,7 @@ DECLARE_FILE_FUNCTIONS(alarm); }, \ } -static struct battery_file { +static const struct battery_file { struct file_operations ops; mode_t mode; const char *name;
drivers/acpi/dock.c +2 -2
@@ -77,7 +77,7 @@ struct dock_dependent_device {struct list_head list;struct list_head hotplug_list;acpi_handle handle; -struct acpi_dock_ops *ops; +const struct acpi_dock_ops *ops;void *context; };
@@ -589,7 +589,7 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifier);* the dock driver after _DCK is executed. */ int -register_hotplug_dock_device (acpi_handle handle,struct acpi_dock_ops *ops, +register_hotplug_dock_device (acpi_handle handle,const struct acpi_dock_ops *ops,void *context) {struct dock_dependent_device *dd;
drivers/acpi/ec_sys.c +1 -1
@@ -92,7 +92,7 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,return count; } -static struct file_operations acpi_ec_io_ops = { +static const struct file_operations acpi_ec_io_ops = { .owner =THIS_MODULE , .open = acpi_ec_open_io, .read = acpi_ec_read_io,
drivers/acpi/fan.c +1 -1
@@ -110,7 +110,7 @@ fan_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state)return result; } -static struct thermal_cooling_device_ops fan_cooling_ops = { +static const struct thermal_cooling_device_ops fan_cooling_ops = { .get_max_state = fan_get_max_state, .get_cur_state = fan_get_cur_state, .set_cur_state = fan_set_cur_state,
drivers/acpi/processor_thermal.c +1 -1
@@ -244,7 +244,7 @@ processor_set_cur_state(struct thermal_cooling_device *cdev,return result; } -struct thermal_cooling_device_ops processor_cooling_ops = { +const struct thermal_cooling_device_ops processor_cooling_ops = { .get_max_state = processor_get_max_state, .get_cur_state = processor_get_cur_state, .set_cur_state = processor_set_cur_state,
drivers/acpi/sysfs.c +2 -2
@@ -149,12 +149,12 @@ static int param_get_debug_level(char *buffer, const struct kernel_param *kp)return result; } -static struct kernel_param_ops param_ops_debug_layer = { +static const struct kernel_param_ops param_ops_debug_layer = { .set = param_set_uint, .get = param_get_debug_layer, }; -static struct kernel_param_ops param_ops_debug_level = { +static const struct kernel_param_ops param_ops_debug_level = { .set = param_set_uint, .get = param_get_debug_level, };
drivers/acpi/thermal.c +1 -1
@@ -812,7 +812,7 @@ acpi_thermal_unbind_cooling_device(struct thermal_zone_device *thermal, thermal_zone_unbind_cooling_device); } -static struct thermal_zone_device_ops acpi_thermal_zone_ops = { +static const struct thermal_zone_device_ops acpi_thermal_zone_ops = { .bind = acpi_thermal_bind_cooling_device, .unbind = acpi_thermal_unbind_cooling_device, .get_temp = thermal_get_temp,
drivers/acpi/video.c +1 -1
@@ -308,7 +308,7 @@ video_set_cur_state(struct thermal_cooling_device *cooling_dev, unsigned long streturn acpi_video_device_lcd_set_level (video, level); } -static struct thermal_cooling_device_ops video_cooling_ops = { +static const struct thermal_cooling_device_ops video_cooling_ops = { .get_max_state = video_get_max_state, .get_cur_state = video_get_cur_state, .set_cur_state = video_set_cur_state,
drivers/ata/libata-acpi.c +2 -2
@@ -218,12 +218,12 @@ static void ata_acpi_dev_uevent(acpi_handle handle, u32 event, void *data)ata_acpi_uevent (dev->link->ap, dev, event); } -static struct acpi_dock_ops ata_acpi_dev_dock_ops = { +static const struct acpi_dock_ops ata_acpi_dev_dock_ops = { .handler = ata_acpi_dev_notify_dock, .uevent = ata_acpi_dev_uevent, }; -static struct acpi_dock_ops ata_acpi_ap_dock_ops = { +static const struct acpi_dock_ops ata_acpi_ap_dock_ops = { .handler = ata_acpi_ap_notify_dock, .uevent = ata_acpi_ap_uevent, };
drivers/pci/hotplug/acpiphp_glue.c +1 -1
@@ -110,7 +110,7 @@ static int post_dock_fixups(struct notifier_block *nb, unsigned long val, } -static struct acpi_dock_ops acpiphp_dock_ops = { +static const struct acpi_dock_ops acpiphp_dock_ops = { .handler = handle_hotplug_event_func, };
include/acpi/acpi_drivers.h +1 -1
@@ -128,7 +128,7 @@ extern int is_dock_device(acpi_handle handle);extern int register_dock_notifier (struct notifier_block *nb);extern void unregister_dock_notifier (struct notifier_block *nb);extern int register_hotplug_dock_device (acpi_handle handle, -struct acpi_dock_ops *ops, +const struct acpi_dock_ops *ops,void *context);extern void unregister_hotplug_dock_device (acpi_handle handle);#else
include/acpi/processor.h +1 -1
@@ -337,7 +337,7 @@ extern struct cpuidle_driver acpi_idle_driver;/* in processor_thermal.c */ int acpi_processor_get_limit_info (struct acpi_processor *pr); -extern struct thermal_cooling_device_ops processor_cooling_ops; +extern const struct thermal_cooling_device_ops processor_cooling_ops;#ifdef CONFIG_CPU_FREQ void acpi_thermal_cpufreq_init (void );void acpi_thermal_cpufreq_exit (void );
---
Signature · 1 line
Vasiliy
Hi Len,
Quoted 8 lines · Vasiliy Kulikov
Structs
battery_file,acpi_dock_ops,file_operations,thermal_cooling_device_ops,thermal_zone_device_ops,kernel_param_opsare not changed in runtime. It is safe to make them const.register_hotplug_dock_device()was altered to take const "ops" argument to respectacpi_dock_ops' const notion.Signed-off-by Vasiliy Kulikov <[email protected]>---
Any problems with the patch?
Quoted 3 lines
Len, I think it can be applied as a single patch to acpi tree as the only non-acpi thing is
acpi_dock_opsin ata/ and pci/, which is really trivial.
Thanks,
Signature · 2 lines
Vasiliy Kulikov http://www.openwall.com - bringing security into open computing environments
Jeff Garzik
Acked-byQuoted 10 lines · Vasiliy Kulikov
Hi Len,
Quoted 7 lines · Vasiliy Kulikov
Structs
battery_file,acpi_dock_ops,file_operations,thermal_cooling_device_ops,thermal_zone_device_ops,kernel_param_opsare not changed in runtime. It is safe to make them const.register_hotplug_dock_device()was altered to take const "ops" argument to respectacpi_dock_ops' const notion.Signed-off-by Vasiliy Kulikov<[email protected]>
applied
thanks,
Len Brown, Intel Open Source Technology Center