ACPI: Remove unnecessary code in acpi drivers
Subsystems (10)
cover ACPI: Remove unnecessary code in acpi drivers
Bjorn critiqued some code in a new acpi driver as unnecesary. However, the same code patterns are present in most acpi drivers. Let's remove them all.
The first patch ammends acpi/scan.c so that the following NULL assignment pattern can be removed with complete confidence:
acpi_driver_remove(acpi_device *device, int removal_type)
{
...
device->driverdata = NULL;
}Some failure paths in scan.c were omitting to clear device->driverdata, and more seriously device->driver, so I fixed that before removing the NULL assignments from drivers.
In total this removes ~150 lines.
drivers/acpi/ac.c | 23 +++------------ drivers/acpi/acpi_memhotplug.c | 13 ++------- drivers/acpi/battery.c | 18 +++--------- drivers/acpi/container.c | 12 ++------ drivers/acpi/ec.c | 9 +----- drivers/acpi/fan.c | 14 +--------- drivers/acpi/pci_link.c | 11 ++++--- drivers/acpi/power.c | 19 ++----------- drivers/acpi/processor_core.c | 7 +---- drivers/acpi/sbs.c | 11 +------ drivers/acpi/sbshc.c | 17 +---------- drivers/acpi/scan.c | 45 ++++++++++++++++++------------ drivers/acpi/thermal.c | 21 +++----------- drivers/acpi/video.c | 17 ++--------- drivers/hwmon/asus_atk0110.c | 2 - drivers/hwmon/hp_accel.c | 9 ------ drivers/input/misc/atlas_btns.c | 5 +--- drivers/platform/x86/asus-laptop.c | 9 ------ drivers/platform/x86/asus_acpi.c | 9 ------ drivers/platform/x86/eeepc-laptop.c | 7 ----- drivers/platform/x86/fujitsu-laptop.c | 6 ---- drivers/platform/x86/intel_menlow.c | 6 ---- drivers/platform/x86/panasonic-laptop.c | 16 +--------- drivers/platform/x86/wmi.c | 3 -- 24 files changed, 70 insertions(+), 239 deletions(-)
PATCH 1/4 ACPI: Remember to clear acpi_dev->driver after calling ops.remove()
If an error occurs while binding a driver to a device and we call remove(), we should also clear acpi->driver and acpi_dev->driverdata. Otherwise bad things will happen e.g. we will invoke the suspend() driver callback when the system is suspended, even though the driver thinks it has been unbound from the device.
Also check the return value of acpi_start_single_object(). I'm not sure what will happen if we claim success despite seeing ops.start() fail and then calling ops.remove(), but it can't be good.
--- drivers/acpi/scan.c | 45 +++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-)
drivers/acpi/scan.c +27 -18
@@ -423,26 +423,33 @@ static int acpi_device_probe(struct device * dev)int ret; ret =acpi_bus_driver_init (acpi_dev, acpi_drv); -if (!ret) { -if (acpi_dev->bus_ops.acpi_op_start) -acpi_start_single_object (acpi_dev); - -if (acpi_drv->ops.notify) { - ret =acpi_device_install_notify_handler (acpi_dev); -if (ret) { -if (acpi_drv->ops.remove) - acpi_drv->ops.remove (acpi_dev, - acpi_dev->removal_type); -return ret; - } - } +if (ret) +return ret; -ACPI_DEBUG_PRINT ((ACPI_DB_INFO , -"Found driver [%s] for device [%s]\n" , - acpi_drv->name, acpi_dev->pnp.bus_id)); -get_device (dev); +if (acpi_dev->bus_ops.acpi_op_start) { + ret =acpi_start_single_object (acpi_dev); +if (ret) +return ret; } -return ret; + +if (acpi_drv->ops.notify) { + ret =acpi_device_install_notify_handler (acpi_dev); +if (ret) { +if (acpi_drv->ops.remove) + acpi_drv->ops.remove (acpi_dev, + acpi_dev->removal_type); + acpi_dev->driver =NULL ; + acpi_dev->driver_data =NULL ; +return ret; + } + } + +ACPI_DEBUG_PRINT ((ACPI_DB_INFO , +"Found driver [%s] for device [%s]\n" , + acpi_drv->name, acpi_dev->pnp.bus_id)); +get_device (dev); + +return 0 ; }static int acpi_device_remove (struct device * dev)
@@ -617,6 +624,8 @@ static int acpi_start_single_object(struct acpi_device *device) result = driver->ops.start (device);if (result && driver->ops.remove) driver->ops.remove (device,ACPI_BUS_REMOVAL_NORMAL ); + device->driver =NULL ; + device->driver_data =NULL ; }return result;
Signature · 1 line
1.6.3.2
PATCH 2/4 ACPI: Remove uneccessary NULL assignments in acpi drivers
In reply to Alan JenkinsThe core is responsibile for clearing device->driverdata on removal.
--- drivers/acpi/ec.c | 1 - drivers/acpi/sbshc.c | 1 - drivers/acpi/video.c | 1 - drivers/hwmon/asus_atk0110.c | 2 -- 4 files changed, 0 insertions(+), 5 deletions(-)
drivers/acpi/ec.c +0 -1
@@ -852,7 +852,6 @@ static int acpi_ec_remove(struct acpi_device *device, int type) }mutex_unlock (&ec->lock);acpi_ec_remove_fs (device); - device->driver_data =NULL ;if (ec == first_ec) first_ec =NULL ;kfree (ec);
drivers/acpi/sbshc.c +0 -1
@@ -304,7 +304,6 @@ static int acpi_smbus_hc_remove(struct acpi_device *device, int type) hc =acpi_driver_data (device);acpi_ec_remove_query_handler (hc->ec, hc->query_bit);kfree (hc); - device->driver_data =NULL ;return 0 ; }
drivers/acpi/video.c +0 -1
@@ -2345,7 +2345,6 @@ static int acpi_video_bus_add(struct acpi_device *device)acpi_video_bus_remove_fs (device); err_free_video:kfree (video); - device->driver_data =NULL ;return error; }
drivers/hwmon/asus_atk0110.c +0 -2
@@ -982,8 +982,6 @@ static int atk_remove(struct acpi_device *device, int type)struct atk_data *data = device->driver_data;dev_dbg (&device->dev,"removing...\n" ); - device->driver_data =NULL ; -atk_remove_files (data);atk_free_sensors (data);hwmon_device_unregister (data->hwmon_dev);
Signature · 1 line
1.6.3.2
PATCH 3/4 ACPI: Remove redundant NULL checks in acpi drivers
In reply to Alan JenkinsThe acpi device callbacks add, start, remove, suspend and resume can never be called with a NULL acpi_device. Each callsite in acpi/scan.c has to dereference the device in order to get the ops structure, e.g.
struct acpi_device *acpi_dev = to_acpi_device(dev);
struct acpi_driver *acpi_drv = acpi_dev->driver;
if (acpi_drv && acpi_drv->ops.suspend)
return acpi_drv->ops.suspend(acpi_dev, state);Remove all checks for acpi_dev == NULL within these callbacks.
Also remove the checks for acpi_driver_data(acpi_dev) == NULL. None of these checks could fail unless the driver does something strange (which none of them do), the acpi core did something terribly wrong, or we have a memory corruption issue. If this does happen then it's best to dereference the pointer and crash noisily.
--- drivers/acpi/ac.c | 18 ++++-------------- drivers/acpi/acpi_memhotplug.c | 11 ++--------- drivers/acpi/battery.c | 16 +++++----------- drivers/acpi/container.c | 8 +------- drivers/acpi/ec.c | 6 +----- drivers/acpi/fan.c | 12 ------------ drivers/acpi/power.c | 17 ++--------------- drivers/acpi/processor_core.c | 7 +------ drivers/acpi/sbs.c | 7 +------ drivers/acpi/sbshc.c | 9 +-------- drivers/acpi/thermal.c | 19 +++---------------- drivers/acpi/video.c | 14 ++------------ drivers/hwmon/hp_accel.c | 6 ------ drivers/platform/x86/asus-laptop.c | 6 ------ drivers/platform/x86/asus_acpi.c | 6 ------ drivers/platform/x86/eeepc-laptop.c | 5 ----- drivers/platform/x86/fujitsu-laptop.c | 6 ------ drivers/platform/x86/intel_menlow.c | 6 ------ drivers/platform/x86/panasonic-laptop.c | 9 --------- 19 files changed, 23 insertions(+), 165 deletions(-)
drivers/acpi/ac.c +4 -14
@@ -256,11 +256,8 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)static int acpi_ac_add (struct acpi_device *device) {int result =0 ; -struct acpi_ac *ac =NULL ; - +struct acpi_ac *ac; -if (!device) -return -EINVAL ; ac =kzalloc (sizeof (struct acpi_ac ),GFP_KERNEL );if (!ac)
@@ -306,11 +303,9 @@ static int acpi_ac_add(struct acpi_device *device)static int acpi_ac_resume (struct acpi_device *device) { -struct acpi_ac *ac; +struct acpi_ac *ac =acpi_driver_data (device);unsigned old_state; -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - ac =acpi_driver_data (device); + old_state = ac->state;if (acpi_ac_get_state (ac))return 0 ;
@@ -323,13 +318,8 @@ static int acpi_ac_resume(struct acpi_device *device)static int acpi_ac_remove (struct acpi_device *device,int type) { -struct acpi_ac *ac =NULL ; - - -if (!device || !acpi_driver_data (device)) -return -EINVAL ; +struct acpi_ac *ac =acpi_driver_data (device); - ac =acpi_driver_data (device);#ifdef CONFIG_ACPI_SYSFS_POWER if (ac->charger.dev)
drivers/acpi/acpi_memhotplug.c +2 -9
@@ -401,11 +401,8 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)static int acpi_memory_device_add (struct acpi_device *device) {int result; -struct acpi_memory_device *mem_device =NULL ; - +struct acpi_memory_device *mem_device; -if (!device) -return -EINVAL ; mem_device =kzalloc (sizeof (struct acpi_memory_device ),GFP_KERNEL );if (!mem_device)
@@ -450,13 +447,9 @@ static int acpi_memory_device_add(struct acpi_device *device)static int acpi_memory_device_remove (struct acpi_device *device,int type) { -struct acpi_memory_device *mem_device =NULL ; +struct acpi_memory_device *mem_device =acpi_driver_data (device); -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - mem_device =acpi_driver_data (device);kfree (mem_device);return 0 ;
drivers/acpi/battery.c +5 -11
@@ -840,9 +840,8 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event)static int acpi_battery_add (struct acpi_device *device) {int result =0 ; -struct acpi_battery *battery =NULL ; -if (!device) -return -EINVAL ; +struct acpi_battery *battery; + battery =kzalloc (sizeof (struct acpi_battery ),GFP_KERNEL );if (!battery)return -ENOMEM ;
@@ -870,11 +869,8 @@ static int acpi_battery_add(struct acpi_device *device)static int acpi_battery_remove (struct acpi_device *device,int type) { -struct acpi_battery *battery =NULL ; +struct acpi_battery *battery =acpi_driver_data (device); -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - battery =acpi_driver_data (device);#ifdef CONFIG_ACPI_PROCFS_POWER acpi_battery_remove_fs (device);#endif
@@ -889,10 +885,8 @@ static int acpi_battery_remove(struct acpi_device *device, int type)/* this is needed to learn about changes made in suspended state */ static int acpi_battery_resume (struct acpi_device *device) { -struct acpi_battery *battery; -if (!device) -return -EINVAL ; - battery =acpi_driver_data (device); +struct acpi_battery *battery =acpi_driver_data (device); + battery->update_time =0 ;acpi_battery_update (battery);return 0 ;
drivers/acpi/container.c +1 -7
@@ -97,11 +97,6 @@ static int acpi_container_add(struct acpi_device *device)struct acpi_container *container; -if (!device) { - printk(KERN_ERR PREFIX "device is NULL\n"); -return -EINVAL ; - } - container =kzalloc (sizeof (struct acpi_container ),GFP_KERNEL );if (!container)return -ENOMEM ;
@@ -120,9 +115,8 @@ static int acpi_container_add(struct acpi_device *device)static int acpi_container_remove (struct acpi_device *device,int type) {acpi_status status =AE_OK ; -struct acpi_container *pc =NULL ; +struct acpi_container *pc =acpi_driver_data (device); - pc =acpi_driver_data (device);kfree (pc);return status; }
drivers/acpi/ec.c +1 -5
@@ -837,13 +837,9 @@ static int acpi_ec_add(struct acpi_device *device)static int acpi_ec_remove (struct acpi_device *device,int type) { -struct acpi_ec *ec; +struct acpi_ec *ec =acpi_driver_data (device);struct acpi_ec_query_handler *handler, *tmp; -if (!device) -return -EINVAL ; - - ec =acpi_driver_data (device);ec_remove_handlers (ec);mutex_lock (&ec->lock);list_for_each_entry_safe (handler, tmp, &ec->list, node) {
drivers/acpi/fan.c +0 -12
@@ -244,9 +244,6 @@ static int acpi_fan_add(struct acpi_device *device)int state =0 ;struct thermal_cooling_device *cdev; -if (!device) -return -EINVAL ; -strcpy (acpi_device_name (device),"Fan" );strcpy (acpi_device_class (device),ACPI_FAN_CLASS );
@@ -300,9 +297,6 @@ static int acpi_fan_remove(struct acpi_device *device, int type) {struct thermal_cooling_device *cdev =acpi_driver_data (device); -if (!device || !cdev) -return -EINVAL ; -acpi_fan_remove_fs (device);sysfs_remove_link (&device->dev.kobj,"thermal_cooling" );sysfs_remove_link (&cdev->device.kobj,"device" );
@@ -313,9 +307,6 @@ static int acpi_fan_remove(struct acpi_device *device, int type)static int acpi_fan_suspend (struct acpi_device *device,pm_message_t state) { -if (!device) -return -EINVAL ; -acpi_bus_set_power (device->handle,ACPI_STATE_D0 );return AE_OK ;
@@ -326,9 +317,6 @@ static int acpi_fan_resume(struct acpi_device *device)int result =0 ;int power_state =0 ; -if (!device) -return -EINVAL ; - result =acpi_bus_get_power (device->handle, &power_state);if (result) { printk(KERN_ERR PREFIX
drivers/acpi/power.c +2 -15
@@ -639,9 +639,6 @@ static int acpi_power_add(struct acpi_device *device)struct acpi_buffer buffer = {sizeof (acpi_object), &acpi_object }; -if (!device) -return -EINVAL ; - resource =kzalloc (sizeof (struct acpi_power_resource ),GFP_KERNEL );if (!resource)return -ENOMEM ;
@@ -695,15 +692,10 @@ static int acpi_power_add(struct acpi_device *device)static int acpi_power_remove (struct acpi_device *device,int type) { -struct acpi_power_resource *resource =NULL ; +struct acpi_power_resource *resource =acpi_driver_data (device);struct list_head *node, *next; -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - resource =acpi_driver_data (device); -acpi_power_remove_fs (device);mutex_lock (&resource->resource_lock);
@@ -722,14 +714,9 @@ static int acpi_power_remove(struct acpi_device *device, int type)static int acpi_power_resume (struct acpi_device *device) {int result =0 , state; -struct acpi_power_resource *resource =NULL ; +struct acpi_power_resource *resource =acpi_driver_data (device);struct acpi_power_reference *ref; -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - resource =acpi_driver_data (device); - result =acpi_power_get_state (device->handle, &state);if (result)return result;
drivers/acpi/processor_core.c +1 -6
@@ -888,13 +888,8 @@ err_free_cpumask:static int acpi_processor_remove (struct acpi_device *device,int type) { -struct acpi_processor *pr =NULL ; - - -if (!device || !acpi_driver_data (device)) -return -EINVAL ; +struct acpi_processor *pr =acpi_driver_data (device); - pr =acpi_driver_data (device);if (pr->id >= nr_cpu_ids) goto free;
drivers/acpi/sbs.c +1 -6
@@ -960,12 +960,9 @@ static int acpi_sbs_add(struct acpi_device *device)static int acpi_sbs_remove (struct acpi_device *device,int type) { -struct acpi_sbs *sbs; +struct acpi_sbs *sbs =acpi_driver_data (device);int id; -if (!device) -return -EINVAL ; - sbs =acpi_driver_data (device);if (!sbs)return -EINVAL ;mutex_lock (&sbs->lock);
@@ -996,8 +993,6 @@ static void acpi_sbs_rmdirs(void)static int acpi_sbs_resume (struct acpi_device *device) {struct acpi_sbs *sbs; -if (!device) -return -EINVAL ; sbs = device->driver_data;acpi_sbs_callback (sbs);return 0 ;
drivers/acpi/sbshc.c +1 -8
@@ -262,9 +262,6 @@ static int acpi_smbus_hc_add(struct acpi_device *device)unsigned long long val;struct acpi_smb_hc *hc; -if (!device) -return -EINVAL ; - status =acpi_evaluate_integer (device->handle,"_EC" ,NULL , &val);if (ACPI_FAILURE (status)) { printk(KERN_ERR PREFIX "error obtaining _EC.\n");
@@ -296,12 +293,8 @@ extern void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit);static int acpi_smbus_hc_remove (struct acpi_device *device,int type) { -struct acpi_smb_hc *hc; - -if (!device) -return -EINVAL ; +struct acpi_smb_hc *hc =acpi_driver_data (device); - hc =acpi_driver_data (device);acpi_ec_remove_query_handler (hc->ec, hc->query_bit);kfree (hc);return 0 ;
drivers/acpi/thermal.c +3 -16
@@ -1361,12 +1361,9 @@ static void acpi_thermal_guess_offset(struct acpi_thermal *tz)static int acpi_thermal_add (struct acpi_device *device) {int result =0 ; -struct acpi_thermal *tz =NULL ; +struct acpi_thermal *tz; -if (!device) -return -EINVAL ; - tz =kzalloc (sizeof (struct acpi_thermal ),GFP_KERNEL );if (!tz)return -ENOMEM ;
@@ -1408,12 +1405,7 @@ end:static int acpi_thermal_remove (struct acpi_device *device,int type) { -struct acpi_thermal *tz =NULL ; - -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - tz =acpi_driver_data (device); +struct acpi_thermal *tz =acpi_driver_data (device);acpi_thermal_remove_fs (device);acpi_thermal_unregister_thermal_zone (tz);
@@ -1424,15 +1416,10 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)static int acpi_thermal_resume (struct acpi_device *device) { -struct acpi_thermal *tz =NULL ; +struct acpi_thermal *tz =acpi_driver_data (device);int i, j, power_state, result; -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - tz =acpi_driver_data (device); -for (i =0 ; i <ACPI_THERMAL_MAX_ACTIVE ; i++) {if (!(&tz->trips.active[i]))break ;
drivers/acpi/video.c +2 -12
@@ -2207,15 +2207,10 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)static int instance;static int acpi_video_resume (struct acpi_device *device) { -struct acpi_video_bus *video; +struct acpi_video_bus *video =acpi_driver_data (device);struct acpi_video_device *video_device;int i; -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - video =acpi_driver_data (device); -for (i =0 ; i < video->attached_count; i++) { video_device = video->attached_array[i].bind_info;if (video_device && video_device->backlight)
@@ -2351,13 +2346,8 @@ static int acpi_video_bus_add(struct acpi_device *device)static int acpi_video_bus_remove (struct acpi_device *device,int type) { -struct acpi_video_bus *video =NULL ; - - -if (!device || !acpi_driver_data (device)) -return -EINVAL ; +struct acpi_video_bus *video =acpi_driver_data (device); - video =acpi_driver_data (device);acpi_video_bus_stop_devices (video);acpi_video_bus_put_devices (video);
drivers/hwmon/hp_accel.c +0 -6
@@ -275,9 +275,6 @@ static int lis3lv02d_add(struct acpi_device *device) {int ret; -if (!device) -return -EINVAL ; - lis3_dev.bus_priv = device; lis3_dev.init = lis3lv02d_acpi_init; lis3_dev.read = lis3lv02d_acpi_read;
@@ -315,9 +312,6 @@ static int lis3lv02d_add(struct acpi_device *device)static int lis3lv02d_remove (struct acpi_device *device,int type) { -if (!device) -return -EINVAL ; -lis3lv02d_joystick_disable ();lis3lv02d_poweroff (&lis3_dev);
drivers/platform/x86/asus-laptop.c +0 -6
@@ -1240,9 +1240,6 @@ static int asus_hotk_add(struct acpi_device *device) {int result; -if (!device) -return -EINVAL ; -pr_notice ("Asus Laptop Support version %s\n" ,ASUS_LAPTOP_VERSION );
@@ -1306,9 +1303,6 @@ end:static int asus_hotk_remove (struct acpi_device *device,int type) { -if (!device || !acpi_driver_data (device)) -return -EINVAL ; -kfree (hotk->name);kfree (hotk);
drivers/platform/x86/asus_acpi.c +0 -6
@@ -1334,9 +1334,6 @@ static int asus_hotk_add(struct acpi_device *device)acpi_status status =AE_OK ;int result; -if (!device) -return -EINVAL ; -printk (KERN_NOTICE "Asus Laptop ACPI Extras version %s\n" ,ASUS_ACPI_VERSION );
@@ -1392,9 +1389,6 @@ end:static int asus_hotk_remove (struct acpi_device *device,int type) { -if (!device || !acpi_driver_data (device)) -return -EINVAL ; -asus_hotk_remove_fs (device);kfree (hotk);
drivers/platform/x86/eeepc-laptop.c +0 -5
@@ -1194,8 +1194,6 @@ static int eeepc_hotk_add(struct acpi_device *device)struct device *dev;int result; -if (!device) -return -EINVAL ;pr_notice (EEEPC_HOTK_NAME "\n" ); ehotk =kzalloc (sizeof (struct eeepc_hotk ),GFP_KERNEL );if (!ehotk)
@@ -1276,9 +1274,6 @@ fail_platform_driver:static int eeepc_hotk_remove (struct acpi_device *device,int type) { -if (!device || !acpi_driver_data (device)) -return -EINVAL ; -eeepc_backlight_exit ();eeepc_rfkill_exit ();eeepc_input_exit ();
drivers/platform/x86/fujitsu-laptop.c +0 -6
@@ -657,9 +657,6 @@ static int acpi_fujitsu_add(struct acpi_device *device)struct input_dev *input;int error; -if (!device) -return -EINVAL ; - fujitsu->acpi_handle = device->handle;sprintf (acpi_device_name (device),"%s" ,ACPI_FUJITSU_DEVICE_NAME );sprintf (acpi_device_class (device),"%s" ,ACPI_FUJITSU_CLASS );
@@ -813,9 +810,6 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)int error;int i; -if (!device) -return -EINVAL ; - fujitsu_hotkey->acpi_handle = device->handle;sprintf (acpi_device_name (device),"%s" ,ACPI_FUJITSU_HOTKEY_DEVICE_NAME );
drivers/platform/x86/intel_menlow.c +0 -6
@@ -156,9 +156,6 @@ static int intel_menlow_memory_add(struct acpi_device *device)acpi_handle dummy;struct thermal_cooling_device *cdev; -if (!device) -return -EINVAL ; - status =acpi_get_handle (device->handle,MEMORY_GET_BANDWIDTH , &dummy);if (ACPI_FAILURE (status)) goto end;
@@ -200,9 +197,6 @@ static int intel_menlow_memory_remove(struct acpi_device *device, int type) {struct thermal_cooling_device *cdev =acpi_driver_data (device); -if (!device || !cdev) -return -EINVAL ; -sysfs_remove_link (&device->dev.kobj,"thermal_cooling" );sysfs_remove_link (&cdev->device.kobj,"device" );thermal_cooling_device_unregister (cdev);
drivers/platform/x86/panasonic-laptop.c +0 -9
@@ -588,9 +588,6 @@ static int acpi_pcc_hotkey_resume(struct acpi_device *device)struct pcc_acpi *pcc =acpi_driver_data (device);acpi_status status =AE_OK ; -if (device ==NULL || pcc ==NULL ) -return -EINVAL ; -ACPI_DEBUG_PRINT ((ACPI_DB_ERROR ,"Sticky mode restore: %d\n" , pcc->sticky_mode));
@@ -604,9 +601,6 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device)struct pcc_acpi *pcc;int num_sifr, result; -if (!device) -return -EINVAL ; - num_sifr =acpi_pcc_get_sqty (device);if (num_sifr >255 ) {
@@ -703,9 +697,6 @@ static int acpi_pcc_hotkey_remove(struct acpi_device *device, int type) {struct pcc_acpi *pcc =acpi_driver_data (device); -if (!device || !pcc) -return -EINVAL ; -sysfs_remove_group (&device->dev.kobj, &pcc_attr_group);backlight_device_unregister (pcc->backlight);
Signature · 1 line
1.6.3.2
Re: [PATCH 3/4] ACPI: Remove redundant NULL checks in acpi drivers
Quoted 12 lines · Alan Jenkins
The acpi device callbacks add, start, remove, suspend and resume can never be called with a NULL
acpi_device. Each callsite inacpi/scan.chas to dereference the device in order to get the ops structure, e.g.struct acpi_device *acpi_dev = to_acpi_device(dev); struct acpi_driver *acpi_drv = acpi_dev->driver; if (acpi_drv && acpi_drv->ops.suspend) return acpi_drv->ops.suspend(acpi_dev, state);Remove all checks for
acpi_dev== NULL within these callbacks.
Quoted 7 lines
Also remove the checks for
acpi_driver_data(acpi_dev)== NULL. None of these checks could fail unless the driver does something strange (which none of them do), the acpi core did something terribly wrong, or we have a memory corruption issue. If this does happen then it's best to dereference the pointer and crash noisily.Signed-off-by Alan Jenkins <[email protected]>
Minor comments below.
Quoted 317 lines
--- drivers/acpi/ac.c | 18 ++++-------------- drivers/acpi/acpi_memhotplug.c | 11 ++--------- drivers/acpi/battery.c | 16 +++++----------- drivers/acpi/container.c | 8 +------- drivers/acpi/ec.c | 6 +----- drivers/acpi/fan.c | 12 ------------ drivers/acpi/power.c | 17 ++--------------- drivers/acpi/processor_core.c | 7 +------ drivers/acpi/sbs.c | 7 +------ drivers/acpi/sbshc.c | 9 +-------- drivers/acpi/thermal.c | 19 +++---------------- drivers/acpi/video.c | 14 ++------------ drivers/hwmon/hp_accel.c | 6 ------ drivers/platform/x86/asus-laptop.c | 6 ------ drivers/platform/x86/asus_acpi.c | 6 ------ drivers/platform/x86/eeepc-laptop.c | 5 ----- drivers/platform/x86/fujitsu-laptop.c | 6 ------ drivers/platform/x86/intel_menlow.c | 6 ------ drivers/platform/x86/panasonic-laptop.c | 9 --------- 19 files changed, 23 insertions(+), 165 deletions(-)drivers/acpi/ac.c +4
-14@@ -256,11 +256,8 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)static int acpi_ac_add (struct acpi_device *device) {int result =0 ; -struct acpi_ac *ac =NULL ; - +struct acpi_ac *ac; -if (!device) -return -EINVAL ; ac =kzalloc (sizeof (struct acpi_ac ),GFP_KERNEL );if (!ac)@@ -306,11 +303,9 @@ static int acpi_ac_add(struct acpi_device *device)static int acpi_ac_resume (struct acpi_device *device) { -struct acpi_ac *ac; +struct acpi_ac *ac =acpi_driver_data (device);unsigned old_state; -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - ac =acpi_driver_data (device); + old_state = ac->state;if (acpi_ac_get_state (ac))return 0 ;@@ -323,13 +318,8 @@ static int acpi_ac_resume(struct acpi_device *device)static int acpi_ac_remove (struct acpi_device *device,int type) { -struct acpi_ac *ac =NULL ; - - -if (!device || !acpi_driver_data (device)) -return -EINVAL ; +struct acpi_ac *ac =acpi_driver_data (device); - ac =acpi_driver_data (device);#ifdef CONFIG_ACPI_SYSFS_POWER if (ac->charger.dev)drivers/acpi/acpi_memhotplug.c +2
-9@@ -401,11 +401,8 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)static int acpi_memory_device_add (struct acpi_device *device) {int result; -struct acpi_memory_device *mem_device =NULL ; - +struct acpi_memory_device *mem_device; -if (!device) -return -EINVAL ; mem_device =kzalloc (sizeof (struct acpi_memory_device ),GFP_KERNEL );if (!mem_device)@@ -450,13 +447,9 @@ static int acpi_memory_device_add(struct acpi_device *device)static int acpi_memory_device_remove (struct acpi_device *device,int type) { -struct acpi_memory_device *mem_device =NULL ; +struct acpi_memory_device *mem_device =acpi_driver_data (device); -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - mem_device =acpi_driver_data (device);kfree (mem_device);return 0 ;drivers/acpi/battery.c +5
-11@@ -840,9 +840,8 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event)static int acpi_battery_add (struct acpi_device *device) {int result =0 ; -struct acpi_battery *battery =NULL ; -if (!device) -return -EINVAL ; +struct acpi_battery *battery; + battery =kzalloc (sizeof (struct acpi_battery ),GFP_KERNEL );if (!battery)return -ENOMEM ;@@ -870,11 +869,8 @@ static int acpi_battery_add(struct acpi_device *device)static int acpi_battery_remove (struct acpi_device *device,int type) { -struct acpi_battery *battery =NULL ; +struct acpi_battery *battery =acpi_driver_data (device); -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - battery =acpi_driver_data (device);#ifdef CONFIG_ACPI_PROCFS_POWER acpi_battery_remove_fs (device);#endif @@ -889,10 +885,8 @@ static int acpi_battery_remove(struct acpi_device *device, int type)/* this is needed to learn about changes made in suspended state */ static int acpi_battery_resume (struct acpi_device *device) { -struct acpi_battery *battery; -if (!device) -return -EINVAL ; - battery =acpi_driver_data (device); +struct acpi_battery *battery =acpi_driver_data (device); + battery->update_time =0 ;acpi_battery_update (battery);return 0 ;drivers/acpi/container.c +1
-7@@ -97,11 +97,6 @@ static int acpi_container_add(struct acpi_device *device)struct acpi_container *container; -if (!device) { - printk(KERN_ERR PREFIX "device is NULL\n"); -return -EINVAL ; - } - container =kzalloc (sizeof (struct acpi_container ),GFP_KERNEL );if (!container)return -ENOMEM ;@@ -120,9 +115,8 @@ static int acpi_container_add(struct acpi_device *device)static int acpi_container_remove (struct acpi_device *device,int type) {acpi_status status =AE_OK ; -struct acpi_container *pc =NULL ; +struct acpi_container *pc =acpi_driver_data (device); - pc =acpi_driver_data (device);kfree (pc);return status; }drivers/acpi/ec.c +1
-5@@ -837,13 +837,9 @@ static int acpi_ec_add(struct acpi_device *device)static int acpi_ec_remove (struct acpi_device *device,int type) { -struct acpi_ec *ec; +struct acpi_ec *ec =acpi_driver_data (device);struct acpi_ec_query_handler *handler, *tmp; -if (!device) -return -EINVAL ; - - ec =acpi_driver_data (device);ec_remove_handlers (ec);mutex_lock (&ec->lock);list_for_each_entry_safe (handler, tmp, &ec->list, node) {drivers/acpi/fan.c +0
-12@@ -244,9 +244,6 @@ static int acpi_fan_add(struct acpi_device *device)int state =0 ;struct thermal_cooling_device *cdev; -if (!device) -return -EINVAL ; -strcpy (acpi_device_name (device),"Fan" );strcpy (acpi_device_class (device),ACPI_FAN_CLASS );@@ -300,9 +297,6 @@ static int acpi_fan_remove(struct acpi_device *device, int type) {struct thermal_cooling_device *cdev =acpi_driver_data (device); -if (!device || !cdev) -return -EINVAL ; -acpi_fan_remove_fs (device);sysfs_remove_link (&device->dev.kobj,"thermal_cooling" );sysfs_remove_link (&cdev->device.kobj,"device" );@@ -313,9 +307,6 @@ static int acpi_fan_remove(struct acpi_device *device, int type)static int acpi_fan_suspend (struct acpi_device *device,pm_message_t state) { -if (!device) -return -EINVAL ; -acpi_bus_set_power (device->handle,ACPI_STATE_D0 );return AE_OK ;@@ -326,9 +317,6 @@ static int acpi_fan_resume(struct acpi_device *device)int result =0 ;int power_state =0 ; -if (!device) -return -EINVAL ; - result =acpi_bus_get_power (device->handle, &power_state);if (result) { printk(KERN_ERR PREFIXdrivers/acpi/power.c +2
-15@@ -639,9 +639,6 @@ static int acpi_power_add(struct acpi_device *device)struct acpi_buffer buffer = {sizeof (acpi_object), &acpi_object }; -if (!device) -return -EINVAL ; - resource =kzalloc (sizeof (struct acpi_power_resource ),GFP_KERNEL );if (!resource)return -ENOMEM ;@@ -695,15 +692,10 @@ static int acpi_power_add(struct acpi_device *device)static int acpi_power_remove (struct acpi_device *device,int type) { -struct acpi_power_resource *resource =NULL ; +struct acpi_power_resource *resource =acpi_driver_data (device);struct list_head *node, *next; -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - resource =acpi_driver_data (device); -acpi_power_remove_fs (device);mutex_lock (&resource->resource_lock);@@ -722,14 +714,9 @@ static int acpi_power_remove(struct acpi_device *device, int type)static int acpi_power_resume (struct acpi_device *device) {int result =0 , state; -struct acpi_power_resource *resource =NULL ; +struct acpi_power_resource *resource =acpi_driver_data (device);struct acpi_power_reference *ref; -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - resource =acpi_driver_data (device); - result =acpi_power_get_state (device->handle, &state);if (result)return result;drivers/acpi/processor_core.c +1
-6@@ -888,13 +888,8 @@ err_free_cpumask:static int acpi_processor_remove (struct acpi_device *device,int type) { -struct acpi_processor *pr =NULL ; - - -if (!device || !acpi_driver_data (device)) -return -EINVAL ; +struct acpi_processor *pr =acpi_driver_data (device); - pr =acpi_driver_data (device);if (pr->id >= nr_cpu_ids) goto free;drivers/acpi/sbs.c +1
-4@@ -960,12 +960,9 @@ static int acpi_sbs_add(struct acpi_device *device)static int acpi_sbs_remove (struct acpi_device *device,int type) { -struct acpi_sbs *sbs; +struct acpi_sbs *sbs =acpi_driver_data (device);int id; -if (!device) -return -EINVAL ; - sbs =acpi_driver_data (device);if (!sbs)return -EINVAL ;mutex_lock (&sbs->lock);
drivers/acpi/sbs.c static void acpi_sbs_rmdirs(void) · line 1000
Quoted 5 lines
drivers/acpi/sbs.c +0
-2@@ -996,8 +993,6 @@ static void acpi_sbs_rmdirs(void)static int acpi_sbs_resume (struct acpi_device *device) {struct acpi_sbs *sbs; -if (!device) -return -EINVAL ;
Nit: I'd pull the sbs initialization up and use acpi_driver_data() as in acpi_sbs_remove(). And add a blank line.
Quoted 131 lines
drivers/acpi/sbs.c +0
-0sbs = device->driver_data;acpi_sbs_callback (sbs);return 0 ;drivers/acpi/sbshc.c +1
-8@@ -262,9 +262,6 @@ static int acpi_smbus_hc_add(struct acpi_device *device)unsigned long long val;struct acpi_smb_hc *hc; -if (!device) -return -EINVAL ; - status =acpi_evaluate_integer (device->handle,"_EC" ,NULL , &val);if (ACPI_FAILURE (status)) { printk(KERN_ERR PREFIX "error obtaining _EC.\n");@@ -296,12 +293,8 @@ extern void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit);static int acpi_smbus_hc_remove (struct acpi_device *device,int type) { -struct acpi_smb_hc *hc; - -if (!device) -return -EINVAL ; +struct acpi_smb_hc *hc =acpi_driver_data (device); - hc =acpi_driver_data (device);acpi_ec_remove_query_handler (hc->ec, hc->query_bit);kfree (hc);return 0 ;drivers/acpi/thermal.c +3
-16@@ -1361,12 +1361,9 @@ static void acpi_thermal_guess_offset(struct acpi_thermal *tz)static int acpi_thermal_add (struct acpi_device *device) {int result =0 ; -struct acpi_thermal *tz =NULL ; +struct acpi_thermal *tz; -if (!device) -return -EINVAL ; - tz =kzalloc (sizeof (struct acpi_thermal ),GFP_KERNEL );if (!tz)return -ENOMEM ;@@ -1408,12 +1405,7 @@ end:static int acpi_thermal_remove (struct acpi_device *device,int type) { -struct acpi_thermal *tz =NULL ; - -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - tz =acpi_driver_data (device); +struct acpi_thermal *tz =acpi_driver_data (device);acpi_thermal_remove_fs (device);acpi_thermal_unregister_thermal_zone (tz);@@ -1424,15 +1416,10 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)static int acpi_thermal_resume (struct acpi_device *device) { -struct acpi_thermal *tz =NULL ; +struct acpi_thermal *tz =acpi_driver_data (device);int i, j, power_state, result; -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - tz =acpi_driver_data (device); -for (i =0 ; i <ACPI_THERMAL_MAX_ACTIVE ; i++) {if (!(&tz->trips.active[i]))break ;drivers/acpi/video.c +2
-12@@ -2207,15 +2207,10 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)static int instance;static int acpi_video_resume (struct acpi_device *device) { -struct acpi_video_bus *video; +struct acpi_video_bus *video =acpi_driver_data (device);struct acpi_video_device *video_device;int i; -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - video =acpi_driver_data (device); -for (i =0 ; i < video->attached_count; i++) { video_device = video->attached_array[i].bind_info;if (video_device && video_device->backlight)@@ -2351,13 +2346,8 @@ static int acpi_video_bus_add(struct acpi_device *device)static int acpi_video_bus_remove (struct acpi_device *device,int type) { -struct acpi_video_bus *video =NULL ; - - -if (!device || !acpi_driver_data (device)) -return -EINVAL ; +struct acpi_video_bus *video =acpi_driver_data (device); - video =acpi_driver_data (device);acpi_video_bus_stop_devices (video);acpi_video_bus_put_devices (video);drivers/hwmon/hp_accel.c +0
-3@@ -275,9 +275,6 @@ static int lis3lv02d_add(struct acpi_device *device) {int ret; -if (!device) -return -EINVAL ; - lis3_dev.bus_priv = device; lis3_dev.init = lis3lv02d_acpi_init; lis3_dev.read = lis3lv02d_acpi_read;
drivers/hwmon/hp_accel.c static int lis3lv02d_add(struct acpi_device *device) · line 316
Quoted 8 lines
drivers/hwmon/hp_accel.c +0
-3@@ -315,9 +312,6 @@ static int lis3lv02d_add(struct acpi_device *device)static int lis3lv02d_remove (struct acpi_device *device,int type) { -if (!device) -return -EINVAL ; -lis3lv02d_joystick_disable ();lis3lv02d_poweroff (&lis3_dev);
Same basic issue as the kfree comments below; the fact that this remove method doesn't reference "device" is a symptom of a driver structure problem (beyond the scope of this patch, obviously).
Quoted 15 lines
drivers/platform/x86/asus-laptop.c +0
-3@@ -1240,9 +1240,6 @@ static int asus_hotk_add(struct acpi_device *device) {int result; -if (!device) -return -EINVAL ; -pr_notice ("Asus Laptop Support version %s\n" ,ASUS_LAPTOP_VERSION );
drivers/platform/x86/asus-laptop.c end: · line 1307
Quoted 8 lines
drivers/platform/x86/asus-laptop.c +0
-3@@ -1306,9 +1303,6 @@ end:static int asus_hotk_remove (struct acpi_device *device,int type) { -if (!device || !acpi_driver_data (device)) -return -EINVAL ; -kfree (hotk->name);kfree (hotk);
Separate issue: we should kfree acpi_driver_data(device) here, not "hotk". In general, the "remove" should deal with per-device data, not globals. This driver only deals with a single instance, so they happen to be the same in this case, but you have to read more of the driver to verify that.
Quoted 16 lines
drivers/platform/x86/asus_acpi.c +0
-3@@ -1334,9 +1334,6 @@ static int asus_hotk_add(struct acpi_device *device)acpi_status status =AE_OK ;int result; -if (!device) -return -EINVAL ; -printk (KERN_NOTICE "Asus Laptop ACPI Extras version %s\n" ,ASUS_ACPI_VERSION );
drivers/platform/x86/asus_acpi.c end: · line 1394
Quoted 9 lines
drivers/platform/x86/asus_acpi.c +0
-3@@ -1392,9 +1389,6 @@ end:static int asus_hotk_remove (struct acpi_device *device,int type) { -if (!device || !acpi_driver_data (device)) -return -EINVAL ; -asus_hotk_remove_fs (device);kfree (hotk);
The kfree comment above applies here, too.
Quoted 14 lines
drivers/platform/x86/eeepc-laptop.c +0
-2@@ -1194,8 +1194,6 @@ static int eeepc_hotk_add(struct acpi_device *device)struct device *dev;int result; -if (!device) -return -EINVAL ;pr_notice (EEEPC_HOTK_NAME "\n" ); ehotk =kzalloc (sizeof (struct eeepc_hotk ),GFP_KERNEL );if (!ehotk)
drivers/platform/x86/eeepc-laptop.c fail_platform_driver: · line 1279
Quoted 9 lines
drivers/platform/x86/eeepc-laptop.c +0
-3@@ -1276,9 +1274,6 @@ fail_platform_driver:static int eeepc_hotk_remove (struct acpi_device *device,int type) { -if (!device || !acpi_driver_data (device)) -return -EINVAL ; -eeepc_backlight_exit ();eeepc_rfkill_exit ();eeepc_input_exit ();
The current upstream version of this function also has the kfree issue. You're patching a different version, so it might be fixed there already. But it seems like all these hotkey drivers (and the accelerometer driver) use the same pattern of assuming they'll only see a single device, and then they make assumptions like "hotk == acpi_driver_data(device)". That's just a bad example for people to follow, and might not even be true for things like accelerometers where you could imagine having more than one.
Quoted 82 lines
drivers/platform/x86/fujitsu-laptop.c +0
-6@@ -657,9 +657,6 @@ static int acpi_fujitsu_add(struct acpi_device *device)struct input_dev *input;int error; -if (!device) -return -EINVAL ; - fujitsu->acpi_handle = device->handle;sprintf (acpi_device_name (device),"%s" ,ACPI_FUJITSU_DEVICE_NAME );sprintf (acpi_device_class (device),"%s" ,ACPI_FUJITSU_CLASS );@@ -813,9 +810,6 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)int error;int i; -if (!device) -return -EINVAL ; - fujitsu_hotkey->acpi_handle = device->handle;sprintf (acpi_device_name (device),"%s" ,ACPI_FUJITSU_HOTKEY_DEVICE_NAME );drivers/platform/x86/intel_menlow.c +0
-6@@ -156,9 +156,6 @@ static int intel_menlow_memory_add(struct acpi_device *device)acpi_handle dummy;struct thermal_cooling_device *cdev; -if (!device) -return -EINVAL ; - status =acpi_get_handle (device->handle,MEMORY_GET_BANDWIDTH , &dummy);if (ACPI_FAILURE (status)) goto end;@@ -200,9 +197,6 @@ static int intel_menlow_memory_remove(struct acpi_device *device, int type) {struct thermal_cooling_device *cdev =acpi_driver_data (device); -if (!device || !cdev) -return -EINVAL ; -sysfs_remove_link (&device->dev.kobj,"thermal_cooling" );sysfs_remove_link (&cdev->device.kobj,"device" );thermal_cooling_device_unregister (cdev);drivers/platform/x86/panasonic-laptop.c +0
-9@@ -588,9 +588,6 @@ static int acpi_pcc_hotkey_resume(struct acpi_device *device)struct pcc_acpi *pcc =acpi_driver_data (device);acpi_status status =AE_OK ; -if (device ==NULL || pcc ==NULL ) -return -EINVAL ; -ACPI_DEBUG_PRINT ((ACPI_DB_ERROR ,"Sticky mode restore: %d\n" , pcc->sticky_mode));@@ -604,9 +601,6 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device)struct pcc_acpi *pcc;int num_sifr, result; -if (!device) -return -EINVAL ; - num_sifr =acpi_pcc_get_sqty (device);if (num_sifr >255 ) {@@ -703,9 +697,6 @@ static int acpi_pcc_hotkey_remove(struct acpi_device *device, int type) {struct pcc_acpi *pcc =acpi_driver_data (device); -if (!device || !pcc) -return -EINVAL ; -sysfs_remove_group (&device->dev.kobj, &pcc_attr_group);backlight_device_unregister (pcc->backlight);
PATCH v2 3/4 ACPI: Remove redundant NULL checks in acpi drivers
The acpi device callbacks add, start, remove, suspend and resume can never be called with a NULL acpi_device. Each callsite in acpi/scan.c has to dereference the device in order to get the ops structure, e.g.
struct acpi_device *acpi_dev = to_acpi_device(dev);
struct acpi_driver *acpi_drv = acpi_dev->driver;
if (acpi_drv && acpi_drv->ops.suspend)
return acpi_drv->ops.suspend(acpi_dev, state);Remove all checks for acpi_dev == NULL within these callbacks.
Also remove the checks for acpi_driver_data(acpi_dev) == NULL. None of these checks could fail unless the driver does something strange (which none of them do), the acpi core did something terribly wrong, or we have a memory corruption issue. If this does happen then it's best to dereference the pointer and crash noisily.
---
v2: Tidy up acpi/sbs.c a little after removing the check
drivers/acpi/ac.c | 18 ++++-------------- drivers/acpi/acpi_memhotplug.c | 11 ++--------- drivers/acpi/battery.c | 16 +++++----------- drivers/acpi/container.c | 8 +------- drivers/acpi/ec.c | 6 +----- drivers/acpi/fan.c | 12 ------------ drivers/acpi/power.c | 17 ++--------------- drivers/acpi/processor_core.c | 7 +------ drivers/acpi/sbs.c | 11 +++-------- drivers/acpi/sbshc.c | 9 +-------- drivers/acpi/thermal.c | 19 +++---------------- drivers/acpi/video.c | 14 ++------------ drivers/hwmon/hp_accel.c | 6 ------ drivers/platform/x86/asus-laptop.c | 6 ------ drivers/platform/x86/asus_acpi.c | 6 ------ drivers/platform/x86/eeepc-laptop.c | 5 ----- drivers/platform/x86/fujitsu-laptop.c | 6 ------ drivers/platform/x86/intel_menlow.c | 6 ------ drivers/platform/x86/panasonic-laptop.c | 9 --------- 19 files changed, 25 insertions(+), 167 deletions(-)
drivers/acpi/ac.c +4 -14
@@ -256,11 +256,8 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)static int acpi_ac_add (struct acpi_device *device) {int result =0 ; -struct acpi_ac *ac =NULL ; - +struct acpi_ac *ac; -if (!device) -return -EINVAL ; ac =kzalloc (sizeof (struct acpi_ac ),GFP_KERNEL );if (!ac)
@@ -306,11 +303,9 @@ static int acpi_ac_add(struct acpi_device *device)static int acpi_ac_resume (struct acpi_device *device) { -struct acpi_ac *ac; +struct acpi_ac *ac =acpi_driver_data (device);unsigned old_state; -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - ac =acpi_driver_data (device); + old_state = ac->state;if (acpi_ac_get_state (ac))return 0 ;
@@ -323,13 +318,8 @@ static int acpi_ac_resume(struct acpi_device *device)static int acpi_ac_remove (struct acpi_device *device,int type) { -struct acpi_ac *ac =NULL ; - - -if (!device || !acpi_driver_data (device)) -return -EINVAL ; +struct acpi_ac *ac =acpi_driver_data (device); - ac =acpi_driver_data (device);#ifdef CONFIG_ACPI_SYSFS_POWER if (ac->charger.dev)
drivers/acpi/acpi_memhotplug.c +2 -9
@@ -401,11 +401,8 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)static int acpi_memory_device_add (struct acpi_device *device) {int result; -struct acpi_memory_device *mem_device =NULL ; - +struct acpi_memory_device *mem_device; -if (!device) -return -EINVAL ; mem_device =kzalloc (sizeof (struct acpi_memory_device ),GFP_KERNEL );if (!mem_device)
@@ -450,13 +447,9 @@ static int acpi_memory_device_add(struct acpi_device *device)static int acpi_memory_device_remove (struct acpi_device *device,int type) { -struct acpi_memory_device *mem_device =NULL ; +struct acpi_memory_device *mem_device =acpi_driver_data (device); -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - mem_device =acpi_driver_data (device);kfree (mem_device);return 0 ;
drivers/acpi/battery.c +5 -11
@@ -840,9 +840,8 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event)static int acpi_battery_add (struct acpi_device *device) {int result =0 ; -struct acpi_battery *battery =NULL ; -if (!device) -return -EINVAL ; +struct acpi_battery *battery; + battery =kzalloc (sizeof (struct acpi_battery ),GFP_KERNEL );if (!battery)return -ENOMEM ;
@@ -870,11 +869,8 @@ static int acpi_battery_add(struct acpi_device *device)static int acpi_battery_remove (struct acpi_device *device,int type) { -struct acpi_battery *battery =NULL ; +struct acpi_battery *battery =acpi_driver_data (device); -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - battery =acpi_driver_data (device);#ifdef CONFIG_ACPI_PROCFS_POWER acpi_battery_remove_fs (device);#endif
@@ -889,10 +885,8 @@ static int acpi_battery_remove(struct acpi_device *device, int type)/* this is needed to learn about changes made in suspended state */ static int acpi_battery_resume (struct acpi_device *device) { -struct acpi_battery *battery; -if (!device) -return -EINVAL ; - battery =acpi_driver_data (device); +struct acpi_battery *battery =acpi_driver_data (device); + battery->update_time =0 ;acpi_battery_update (battery);return 0 ;
drivers/acpi/container.c +1 -7
@@ -97,11 +97,6 @@ static int acpi_container_add(struct acpi_device *device)struct acpi_container *container; -if (!device) { - printk(KERN_ERR PREFIX "device is NULL\n"); -return -EINVAL ; - } - container =kzalloc (sizeof (struct acpi_container ),GFP_KERNEL );if (!container)return -ENOMEM ;
@@ -120,9 +115,8 @@ static int acpi_container_add(struct acpi_device *device)static int acpi_container_remove (struct acpi_device *device,int type) {acpi_status status =AE_OK ; -struct acpi_container *pc =NULL ; +struct acpi_container *pc =acpi_driver_data (device); - pc =acpi_driver_data (device);kfree (pc);return status; }
drivers/acpi/ec.c +1 -5
@@ -837,13 +837,9 @@ static int acpi_ec_add(struct acpi_device *device)static int acpi_ec_remove (struct acpi_device *device,int type) { -struct acpi_ec *ec; +struct acpi_ec *ec =acpi_driver_data (device);struct acpi_ec_query_handler *handler, *tmp; -if (!device) -return -EINVAL ; - - ec =acpi_driver_data (device);ec_remove_handlers (ec);mutex_lock (&ec->lock);list_for_each_entry_safe (handler, tmp, &ec->list, node) {
drivers/acpi/fan.c +0 -12
@@ -244,9 +244,6 @@ static int acpi_fan_add(struct acpi_device *device)int state =0 ;struct thermal_cooling_device *cdev; -if (!device) -return -EINVAL ; -strcpy (acpi_device_name (device),"Fan" );strcpy (acpi_device_class (device),ACPI_FAN_CLASS );
@@ -300,9 +297,6 @@ static int acpi_fan_remove(struct acpi_device *device, int type) {struct thermal_cooling_device *cdev =acpi_driver_data (device); -if (!device || !cdev) -return -EINVAL ; -acpi_fan_remove_fs (device);sysfs_remove_link (&device->dev.kobj,"thermal_cooling" );sysfs_remove_link (&cdev->device.kobj,"device" );
@@ -313,9 +307,6 @@ static int acpi_fan_remove(struct acpi_device *device, int type)static int acpi_fan_suspend (struct acpi_device *device,pm_message_t state) { -if (!device) -return -EINVAL ; -acpi_bus_set_power (device->handle,ACPI_STATE_D0 );return AE_OK ;
@@ -326,9 +317,6 @@ static int acpi_fan_resume(struct acpi_device *device)int result =0 ;int power_state =0 ; -if (!device) -return -EINVAL ; - result =acpi_bus_get_power (device->handle, &power_state);if (result) { printk(KERN_ERR PREFIX
drivers/acpi/power.c +2 -15
@@ -639,9 +639,6 @@ static int acpi_power_add(struct acpi_device *device)struct acpi_buffer buffer = {sizeof (acpi_object), &acpi_object }; -if (!device) -return -EINVAL ; - resource =kzalloc (sizeof (struct acpi_power_resource ),GFP_KERNEL );if (!resource)return -ENOMEM ;
@@ -695,15 +692,10 @@ static int acpi_power_add(struct acpi_device *device)static int acpi_power_remove (struct acpi_device *device,int type) { -struct acpi_power_resource *resource =NULL ; +struct acpi_power_resource *resource =acpi_driver_data (device);struct list_head *node, *next; -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - resource =acpi_driver_data (device); -acpi_power_remove_fs (device);mutex_lock (&resource->resource_lock);
@@ -722,14 +714,9 @@ static int acpi_power_remove(struct acpi_device *device, int type)static int acpi_power_resume (struct acpi_device *device) {int result =0 , state; -struct acpi_power_resource *resource =NULL ; +struct acpi_power_resource *resource =acpi_driver_data (device);struct acpi_power_reference *ref; -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - resource =acpi_driver_data (device); - result =acpi_power_get_state (device->handle, &state);if (result)return result;
drivers/acpi/processor_core.c +1 -6
@@ -888,13 +888,8 @@ err_free_cpumask:static int acpi_processor_remove (struct acpi_device *device,int type) { -struct acpi_processor *pr =NULL ; - - -if (!device || !acpi_driver_data (device)) -return -EINVAL ; +struct acpi_processor *pr =acpi_driver_data (device); - pr =acpi_driver_data (device);if (pr->id >= nr_cpu_ids) goto free;
drivers/acpi/sbs.c +3 -8
@@ -960,12 +960,9 @@ static int acpi_sbs_add(struct acpi_device *device)static int acpi_sbs_remove (struct acpi_device *device,int type) { -struct acpi_sbs *sbs; +struct acpi_sbs *sbs =acpi_driver_data (device);int id; -if (!device) -return -EINVAL ; - sbs =acpi_driver_data (device);if (!sbs)return -EINVAL ;mutex_lock (&sbs->lock);
@@ -995,10 +992,8 @@ static void acpi_sbs_rmdirs(void)static int acpi_sbs_resume (struct acpi_device *device) { -struct acpi_sbs *sbs; -if (!device) -return -EINVAL ; - sbs = device->driver_data; +struct acpi_sbs *sbs =acpi_driver_data (device); +acpi_sbs_callback (sbs);return 0 ; }
drivers/acpi/sbshc.c +1 -8
@@ -262,9 +262,6 @@ static int acpi_smbus_hc_add(struct acpi_device *device)unsigned long long val;struct acpi_smb_hc *hc; -if (!device) -return -EINVAL ; - status =acpi_evaluate_integer (device->handle,"_EC" ,NULL , &val);if (ACPI_FAILURE (status)) { printk(KERN_ERR PREFIX "error obtaining _EC.\n");
@@ -296,12 +293,8 @@ extern void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit);static int acpi_smbus_hc_remove (struct acpi_device *device,int type) { -struct acpi_smb_hc *hc; - -if (!device) -return -EINVAL ; +struct acpi_smb_hc *hc =acpi_driver_data (device); - hc =acpi_driver_data (device);acpi_ec_remove_query_handler (hc->ec, hc->query_bit);kfree (hc);return 0 ;
drivers/acpi/thermal.c +3 -16
@@ -1361,12 +1361,9 @@ static void acpi_thermal_guess_offset(struct acpi_thermal *tz)static int acpi_thermal_add (struct acpi_device *device) {int result =0 ; -struct acpi_thermal *tz =NULL ; +struct acpi_thermal *tz; -if (!device) -return -EINVAL ; - tz =kzalloc (sizeof (struct acpi_thermal ),GFP_KERNEL );if (!tz)return -ENOMEM ;
@@ -1408,12 +1405,7 @@ end:static int acpi_thermal_remove (struct acpi_device *device,int type) { -struct acpi_thermal *tz =NULL ; - -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - tz =acpi_driver_data (device); +struct acpi_thermal *tz =acpi_driver_data (device);acpi_thermal_remove_fs (device);acpi_thermal_unregister_thermal_zone (tz);
@@ -1424,15 +1416,10 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)static int acpi_thermal_resume (struct acpi_device *device) { -struct acpi_thermal *tz =NULL ; +struct acpi_thermal *tz =acpi_driver_data (device);int i, j, power_state, result; -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - tz =acpi_driver_data (device); -for (i =0 ; i <ACPI_THERMAL_MAX_ACTIVE ; i++) {if (!(&tz->trips.active[i]))break ;
drivers/acpi/video.c +2 -12
@@ -2207,15 +2207,10 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)static int instance;static int acpi_video_resume (struct acpi_device *device) { -struct acpi_video_bus *video; +struct acpi_video_bus *video =acpi_driver_data (device);struct acpi_video_device *video_device;int i; -if (!device || !acpi_driver_data (device)) -return -EINVAL ; - - video =acpi_driver_data (device); -for (i =0 ; i < video->attached_count; i++) { video_device = video->attached_array[i].bind_info;if (video_device && video_device->backlight)
@@ -2351,13 +2346,8 @@ static int acpi_video_bus_add(struct acpi_device *device)static int acpi_video_bus_remove (struct acpi_device *device,int type) { -struct acpi_video_bus *video =NULL ; - - -if (!device || !acpi_driver_data (device)) -return -EINVAL ; +struct acpi_video_bus *video =acpi_driver_data (device); - video =acpi_driver_data (device);acpi_video_bus_stop_devices (video);acpi_video_bus_put_devices (video);
drivers/hwmon/hp_accel.c +0 -6
@@ -275,9 +275,6 @@ static int lis3lv02d_add(struct acpi_device *device) {int ret; -if (!device) -return -EINVAL ; - lis3_dev.bus_priv = device; lis3_dev.init = lis3lv02d_acpi_init; lis3_dev.read = lis3lv02d_acpi_read;
@@ -315,9 +312,6 @@ static int lis3lv02d_add(struct acpi_device *device)static int lis3lv02d_remove (struct acpi_device *device,int type) { -if (!device) -return -EINVAL ; -lis3lv02d_joystick_disable ();lis3lv02d_poweroff (&lis3_dev);
drivers/platform/x86/asus-laptop.c +0 -6
@@ -1240,9 +1240,6 @@ static int asus_hotk_add(struct acpi_device *device) {int result; -if (!device) -return -EINVAL ; -pr_notice ("Asus Laptop Support version %s\n" ,ASUS_LAPTOP_VERSION );
@@ -1306,9 +1303,6 @@ end:static int asus_hotk_remove (struct acpi_device *device,int type) { -if (!device || !acpi_driver_data (device)) -return -EINVAL ; -kfree (hotk->name);kfree (hotk);
drivers/platform/x86/asus_acpi.c +0 -6
@@ -1334,9 +1334,6 @@ static int asus_hotk_add(struct acpi_device *device)acpi_status status =AE_OK ;int result; -if (!device) -return -EINVAL ; -printk (KERN_NOTICE "Asus Laptop ACPI Extras version %s\n" ,ASUS_ACPI_VERSION );
@@ -1392,9 +1389,6 @@ end:static int asus_hotk_remove (struct acpi_device *device,int type) { -if (!device || !acpi_driver_data (device)) -return -EINVAL ; -asus_hotk_remove_fs (device);kfree (hotk);
drivers/platform/x86/eeepc-laptop.c +0 -5
@@ -1194,8 +1194,6 @@ static int eeepc_hotk_add(struct acpi_device *device)struct device *dev;int result; -if (!device) -return -EINVAL ;pr_notice (EEEPC_HOTK_NAME "\n" ); ehotk =kzalloc (sizeof (struct eeepc_hotk ),GFP_KERNEL );if (!ehotk)
@@ -1276,9 +1274,6 @@ fail_platform_driver:static int eeepc_hotk_remove (struct acpi_device *device,int type) { -if (!device || !acpi_driver_data (device)) -return -EINVAL ; -eeepc_backlight_exit ();eeepc_rfkill_exit ();eeepc_input_exit ();
drivers/platform/x86/fujitsu-laptop.c +0 -6
@@ -657,9 +657,6 @@ static int acpi_fujitsu_add(struct acpi_device *device)struct input_dev *input;int error; -if (!device) -return -EINVAL ; - fujitsu->acpi_handle = device->handle;sprintf (acpi_device_name (device),"%s" ,ACPI_FUJITSU_DEVICE_NAME );sprintf (acpi_device_class (device),"%s" ,ACPI_FUJITSU_CLASS );
@@ -813,9 +810,6 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)int error;int i; -if (!device) -return -EINVAL ; - fujitsu_hotkey->acpi_handle = device->handle;sprintf (acpi_device_name (device),"%s" ,ACPI_FUJITSU_HOTKEY_DEVICE_NAME );
drivers/platform/x86/intel_menlow.c +0 -6
@@ -156,9 +156,6 @@ static int intel_menlow_memory_add(struct acpi_device *device)acpi_handle dummy;struct thermal_cooling_device *cdev; -if (!device) -return -EINVAL ; - status =acpi_get_handle (device->handle,MEMORY_GET_BANDWIDTH , &dummy);if (ACPI_FAILURE (status)) goto end;
@@ -200,9 +197,6 @@ static int intel_menlow_memory_remove(struct acpi_device *device, int type) {struct thermal_cooling_device *cdev =acpi_driver_data (device); -if (!device || !cdev) -return -EINVAL ; -sysfs_remove_link (&device->dev.kobj,"thermal_cooling" );sysfs_remove_link (&cdev->device.kobj,"device" );thermal_cooling_device_unregister (cdev);
drivers/platform/x86/panasonic-laptop.c +0 -9
@@ -588,9 +588,6 @@ static int acpi_pcc_hotkey_resume(struct acpi_device *device)struct pcc_acpi *pcc =acpi_driver_data (device);acpi_status status =AE_OK ; -if (device ==NULL || pcc ==NULL ) -return -EINVAL ; -ACPI_DEBUG_PRINT ((ACPI_DB_ERROR ,"Sticky mode restore: %d\n" , pcc->sticky_mode));
@@ -604,9 +601,6 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device)struct pcc_acpi *pcc;int num_sifr, result; -if (!device) -return -EINVAL ; - num_sifr =acpi_pcc_get_sqty (device);if (num_sifr >255 ) {
@@ -703,9 +697,6 @@ static int acpi_pcc_hotkey_remove(struct acpi_device *device, int type) {struct pcc_acpi *pcc =acpi_driver_data (device); -if (!device || !pcc) -return -EINVAL ; -sysfs_remove_group (&device->dev.kobj, &pcc_attr_group);backlight_device_unregister (pcc->backlight);
Signature · 1 line
1.6.3.2
PATCH 4/4 ACPI: Remove uneccesary acpi_disabled checks in acpi drivers
In reply to Alan Jenkinsacpi_bus_register_driver() already checks acpi_disabled, so acpi bus drivers don't need to. Also, pass on the return value when it fails instead of assuming ENODEV.
--- drivers/acpi/ac.c | 5 +---- drivers/acpi/acpi_memhotplug.c | 2 +- drivers/acpi/battery.c | 2 -- drivers/acpi/container.c | 4 ++-- drivers/acpi/ec.c | 2 +- drivers/acpi/fan.c | 2 +- drivers/acpi/pci_link.c | 11 ++++++----- drivers/acpi/power.c | 2 +- drivers/acpi/sbs.c | 4 +--- drivers/acpi/sbshc.c | 7 +------ drivers/acpi/thermal.c | 2 +- drivers/acpi/video.c | 2 +- drivers/hwmon/hp_accel.c | 3 --- drivers/input/misc/atlas_btns.c | 5 +---- drivers/platform/x86/asus-laptop.c | 3 --- drivers/platform/x86/asus_acpi.c | 3 --- drivers/platform/x86/eeepc-laptop.c | 2 -- drivers/platform/x86/panasonic-laptop.c | 7 ++----- drivers/platform/x86/wmi.c | 3 --- 19 files changed, 20 insertions(+), 51 deletions(-)
drivers/acpi/ac.c +1 -4
@@ -338,9 +338,6 @@ static int __init acpi_ac_init(void) {int result; -if (acpi_disabled) -return -ENODEV ; -#ifdef CONFIG_ACPI_PROCFS_POWER acpi_ac_dir =acpi_lock_ac_dir ();if (!acpi_ac_dir)
@@ -352,7 +349,7 @@ static int __init acpi_ac_init(void)#ifdef CONFIG_ACPI_PROCFS_POWER acpi_unlock_ac_dir (acpi_ac_dir);#endif -return -ENODEV ; +return result; }return 0 ;
drivers/acpi/acpi_memhotplug.c +1 -1
@@ -526,7 +526,7 @@ static int __init acpi_memory_device_init(void) result =acpi_bus_register_driver (&acpi_memory_device_driver);if (result <0 ) -return -ENODEV ; +return result; status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
drivers/acpi/battery.c +0 -2
@@ -907,8 +907,6 @@ static struct acpi_driver acpi_battery_driver = {static void __init acpi_battery_init_async (void *unused,async_cookie_t cookie) { -if (acpi_disabled) -return ;#ifdef CONFIG_ACPI_PROCFS_POWER acpi_battery_dir =acpi_lock_battery_dir ();if (!acpi_battery_dir)
drivers/acpi/container.c +2 -2
@@ -245,7 +245,7 @@ static int __init acpi_container_init(void) result =acpi_bus_register_driver (&acpi_container_driver);if (result <0 ) { -return (result); +return result; }/* register notify handler to every container device */
@@ -254,7 +254,7 @@ static int __init acpi_container_init(void)ACPI_UINT32_MAX , container_walk_namespace_cb, &action, NULL); -return (0 ); +return 0 ; } static void __exit acpi_container_exit(void)
drivers/acpi/ec.c +1 -1
@@ -1010,7 +1010,7 @@ int __init acpi_ec_init(void) result =acpi_bus_register_driver (&acpi_ec_driver);if (result <0 ) {remove_proc_entry (ACPI_EC_CLASS , acpi_root_dir); -return -ENODEV ; +return result; }return result;
drivers/acpi/fan.c +1 -1
@@ -345,7 +345,7 @@ static int __init acpi_fan_init(void) result =acpi_bus_register_driver (&acpi_fan_driver);if (result <0 ) {remove_proc_entry (ACPI_FAN_CLASS , acpi_root_dir); -return -ENODEV ; +return result; }return 0 ;
drivers/acpi/pci_link.c +6 -5
@@ -769,9 +769,7 @@ static int irqrouter_resume(struct sys_device *dev)static int acpi_pci_link_remove (struct acpi_device *device,int type) { -struct acpi_pci_link *link; - - link =acpi_driver_data (device); +struct acpi_pci_link *link =acpi_driver_data (device);mutex_lock (&acpi_link_lock);list_del (&link->list);
@@ -900,6 +898,8 @@ device_initcall(irqrouter_init_sysfs);static int __init acpi_pci_link_init (void ) { +int result; +if (acpi_noirq)return 0 ;
@@ -911,8 +911,9 @@ static int __init acpi_pci_link_init(void) acpi_irq_balance =0 ; } -if (acpi_bus_register_driver (&acpi_pci_link_driver) <0 ) -return -ENODEV ; + result =acpi_bus_register_driver (&acpi_pci_link_driver); +if (result <0 ) +return result;return 0 ; }
drivers/acpi/power.c +1 -1
@@ -747,7 +747,7 @@ int __init acpi_power_init(void) result =acpi_bus_register_driver (&acpi_power_driver);if (result <0 ) {remove_proc_entry (ACPI_POWER_CLASS , acpi_root_dir); -return -ENODEV ; +return result; }return 0 ;
drivers/acpi/sbs.c +1 -3
@@ -1013,8 +1013,6 @@ static int __init acpi_sbs_init(void) {int result =0 ; -if (acpi_disabled) -return -ENODEV ;#ifdef CONFIG_ACPI_PROCFS_POWER acpi_ac_dir =acpi_lock_ac_dir ();if (!acpi_ac_dir)
@@ -1028,7 +1026,7 @@ static int __init acpi_sbs_init(void) result =acpi_bus_register_driver (&acpi_sbs_driver);if (result <0 ) {acpi_sbs_rmdirs (); -return -ENODEV ; +return result; }return 0 ; }
drivers/acpi/sbshc.c +1 -6
@@ -302,12 +302,7 @@ static int acpi_smbus_hc_remove(struct acpi_device *device, int type)static int __init acpi_smb_hc_init (void ) { -int result; - - result =acpi_bus_register_driver (&acpi_smb_hc_driver); -if (result <0 ) -return -ENODEV ; -return 0 ; +return acpi_bus_register_driver (&acpi_smb_hc_driver); } static void __exit acpi_smb_hc_exit(void)
drivers/acpi/thermal.c +1 -1
@@ -1534,7 +1534,7 @@ static int __init acpi_thermal_init(void) result =acpi_bus_register_driver (&acpi_thermal_driver);if (result <0 ) {remove_proc_entry (ACPI_THERMAL_CLASS , acpi_root_dir); -return -ENODEV ; +return result; }return 0 ;
drivers/acpi/video.c +1 -1
@@ -2398,7 +2398,7 @@ int acpi_video_register(void) result =acpi_bus_register_driver (&acpi_video_bus);if (result <0 ) {remove_proc_entry (ACPI_VIDEO_CLASS , acpi_root_dir); -return -ENODEV ; +return result; }/*
drivers/hwmon/hp_accel.c +0 -3
@@ -357,9 +357,6 @@ static int __init lis3lv02d_init_module(void) {int ret; -if (acpi_disabled) -return -ENODEV ; - ret =acpi_bus_register_driver (&lis3lv02d_driver);if (ret <0 )return ret;
drivers/input/misc/atlas_btns.c +1 -4
@@ -156,13 +156,10 @@ static int __init atlas_acpi_init(void) {int result; -if (acpi_disabled) -return -ENODEV ; - result =acpi_bus_register_driver (&atlas_acpi_driver);if (result <0 ) {printk (KERN_ERR "Atlas ACPI: Unable to register driver\n" ); -return -ENODEV ; +return result; }return 0 ;
drivers/platform/x86/asus-laptop.c +0 -3
@@ -1438,9 +1438,6 @@ static int __init asus_laptop_init(void) {int result; -if (acpi_disabled) -return -ENODEV ; - result =acpi_bus_register_driver (&asus_hotk_driver);if (result <0 )return result;
drivers/platform/x86/asus_acpi.c +0 -3
@@ -1416,9 +1416,6 @@ static int __init asus_acpi_init(void) {int result; -if (acpi_disabled) -return -ENODEV ; - asus_proc_dir =proc_mkdir (PROC_ASUS , acpi_root_dir);if (!asus_proc_dir) {printk (KERN_ERR "Asus ACPI: Unable to create /proc entry\n" );
drivers/platform/x86/eeepc-laptop.c +0 -2
@@ -1291,8 +1291,6 @@ static int __init eeepc_laptop_init(void) {int result; -if (acpi_disabled) -return -ENODEV ; result =acpi_bus_register_driver (&eeepc_hotk_driver);if (result <0 )return result;
drivers/platform/x86/panasonic-laptop.c +2 -5
@@ -678,16 +678,13 @@ out_hotkey:static int __init acpi_pcc_init (void ) { -int result =0 ; - -if (acpi_disabled) -return -ENODEV ; +int result; result =acpi_bus_register_driver (&acpi_pcc_driver);if (result <0 ) {ACPI_DEBUG_PRINT ((ACPI_DB_ERROR ,"Error registering hotkey driver\n" )); -return -ENODEV ; +return result; }return 0 ;
drivers/platform/x86/wmi.c +0 -3
@@ -702,9 +702,6 @@ static int __init acpi_wmi_init(void)INIT_LIST_HEAD (&wmi_blocks.list); -if (acpi_disabled) -return -ENODEV ; - result =acpi_bus_register_driver (&acpi_wmi_driver);if (result <0 ) {
Signature · 1 line
1.6.3.2
Re: [PATCH 4/4] ACPI: Remove uneccesary acpi_disabled checks in acpi drivers
Quoted 5 lines · Alan Jenkins
acpi_bus_register_driver()already checksacpi_disabled, so acpi bus drivers don't need to. Also, pass on the return value when it fails instead of assuming ENODEV.Signed-off-by Alan Jenkins <[email protected]>
Minor comments below. Thanks for doing this.
Quoted 37 lines
--- drivers/acpi/ac.c | 5 +---- drivers/acpi/acpi_memhotplug.c | 2 +- drivers/acpi/battery.c | 2 -- drivers/acpi/container.c | 4 ++-- drivers/acpi/ec.c | 2 +- drivers/acpi/fan.c | 2 +- drivers/acpi/pci_link.c | 11 ++++++----- drivers/acpi/power.c | 2 +- drivers/acpi/sbs.c | 4 +--- drivers/acpi/sbshc.c | 7 +------ drivers/acpi/thermal.c | 2 +- drivers/acpi/video.c | 2 +- drivers/hwmon/hp_accel.c | 3 --- drivers/input/misc/atlas_btns.c | 5 +---- drivers/platform/x86/asus-laptop.c | 3 --- drivers/platform/x86/asus_acpi.c | 3 --- drivers/platform/x86/eeepc-laptop.c | 2 -- drivers/platform/x86/panasonic-laptop.c | 7 ++----- drivers/platform/x86/wmi.c | 3 --- 19 files changed, 20 insertions(+), 51 deletions(-)drivers/acpi/ac.c +0
-3@@ -338,9 +338,6 @@ static int __init acpi_ac_init(void) {int result; -if (acpi_disabled) -return -ENODEV ; -#ifdef CONFIG_ACPI_PROCFS_POWER acpi_ac_dir =acpi_lock_ac_dir ();if (!acpi_ac_dir)
drivers/acpi/ac.c static int __init acpi_ac_init(void) · line 351
Quoted 3 lines
drivers/acpi/ac.c +0
-0@@ -352,7 +349,7 @@ static int __init acpi_ac_init(void)#ifdef CONFIG_ACPI_PROCFS_POWER acpi_unlock_ac_dir (acpi_ac_dir);#endif
Idle thought: I wonder if it'd be worth having a driver method for procfs/sysfs management. There are a bunch of drivers that do this, and it's always a pain to figure out whether they do the right thing and in the right order.
Quoted 213 lines
drivers/acpi/ac.c +1
-1-return -ENODEV ; +return result; }return 0 ;drivers/acpi/acpi_memhotplug.c +1
-1@@ -526,7 +526,7 @@ static int __init acpi_memory_device_init(void) result =acpi_bus_register_driver (&acpi_memory_device_driver);if (result <0 ) -return -ENODEV ; +return result; status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,drivers/acpi/battery.c +0
-2@@ -907,8 +907,6 @@ static struct acpi_driver acpi_battery_driver = {static void __init acpi_battery_init_async (void *unused,async_cookie_t cookie) { -if (acpi_disabled) -return ;#ifdef CONFIG_ACPI_PROCFS_POWER acpi_battery_dir =acpi_lock_battery_dir ();if (!acpi_battery_dir)drivers/acpi/container.c +2
-2@@ -245,7 +245,7 @@ static int __init acpi_container_init(void) result =acpi_bus_register_driver (&acpi_container_driver);if (result <0 ) { -return (result); +return result; }/* register notify handler to every container device */ @@ -254,7 +254,7 @@ static int __init acpi_container_init(void)ACPI_UINT32_MAX , container_walk_namespace_cb, &action, NULL); -return (0 ); +return 0 ; } static void __exit acpi_container_exit(void)drivers/acpi/ec.c +1
-1@@ -1010,7 +1010,7 @@ int __init acpi_ec_init(void) result =acpi_bus_register_driver (&acpi_ec_driver);if (result <0 ) {remove_proc_entry (ACPI_EC_CLASS , acpi_root_dir); -return -ENODEV ; +return result; }return result;drivers/acpi/fan.c +1
-1@@ -345,7 +345,7 @@ static int __init acpi_fan_init(void) result =acpi_bus_register_driver (&acpi_fan_driver);if (result <0 ) {remove_proc_entry (ACPI_FAN_CLASS , acpi_root_dir); -return -ENODEV ; +return result; }return 0 ;drivers/acpi/pci_link.c +6
-5@@ -769,9 +769,7 @@ static int irqrouter_resume(struct sys_device *dev)static int acpi_pci_link_remove (struct acpi_device *device,int type) { -struct acpi_pci_link *link; - - link =acpi_driver_data (device); +struct acpi_pci_link *link =acpi_driver_data (device);mutex_lock (&acpi_link_lock);list_del (&link->list);@@ -900,6 +898,8 @@ device_initcall(irqrouter_init_sysfs);static int __init acpi_pci_link_init (void ) { +int result; +if (acpi_noirq)return 0 ;@@ -911,8 +911,9 @@ static int __init acpi_pci_link_init(void) acpi_irq_balance =0 ; } -if (acpi_bus_register_driver (&acpi_pci_link_driver) <0 ) -return -ENODEV ; + result =acpi_bus_register_driver (&acpi_pci_link_driver); +if (result <0 ) +return result;return 0 ; }drivers/acpi/power.c +1
-1@@ -747,7 +747,7 @@ int __init acpi_power_init(void) result =acpi_bus_register_driver (&acpi_power_driver);if (result <0 ) {remove_proc_entry (ACPI_POWER_CLASS , acpi_root_dir); -return -ENODEV ; +return result; }return 0 ;drivers/acpi/sbs.c +1
-3@@ -1013,8 +1013,6 @@ static int __init acpi_sbs_init(void) {int result =0 ; -if (acpi_disabled) -return -ENODEV ;#ifdef CONFIG_ACPI_PROCFS_POWER acpi_ac_dir =acpi_lock_ac_dir ();if (!acpi_ac_dir)@@ -1028,7 +1026,7 @@ static int __init acpi_sbs_init(void) result =acpi_bus_register_driver (&acpi_sbs_driver);if (result <0 ) {acpi_sbs_rmdirs (); -return -ENODEV ; +return result; }return 0 ; }drivers/acpi/sbshc.c +1
-6@@ -302,12 +302,7 @@ static int acpi_smbus_hc_remove(struct acpi_device *device, int type)static int __init acpi_smb_hc_init (void ) { -int result; - - result =acpi_bus_register_driver (&acpi_smb_hc_driver); -if (result <0 ) -return -ENODEV ; -return 0 ; +return acpi_bus_register_driver (&acpi_smb_hc_driver); } static void __exit acpi_smb_hc_exit(void)drivers/acpi/thermal.c +1
-1@@ -1534,7 +1534,7 @@ static int __init acpi_thermal_init(void) result =acpi_bus_register_driver (&acpi_thermal_driver);if (result <0 ) {remove_proc_entry (ACPI_THERMAL_CLASS , acpi_root_dir); -return -ENODEV ; +return result; }return 0 ;drivers/acpi/video.c +1
-1@@ -2398,7 +2398,7 @@ int acpi_video_register(void) result =acpi_bus_register_driver (&acpi_video_bus);if (result <0 ) {remove_proc_entry (ACPI_VIDEO_CLASS , acpi_root_dir); -return -ENODEV ; +return result; }/* drivers/hwmon/hp_accel.c +0
-3@@ -357,9 +357,6 @@ static int __init lis3lv02d_init_module(void) {int ret; -if (acpi_disabled) -return -ENODEV ; - ret =acpi_bus_register_driver (&lis3lv02d_driver);if (ret <0 )return ret;drivers/input/misc/atlas_btns.c +0
-0
drivers/input/misc/atlas_btns.c static int __init atlas_acpi_init(void) · line 161
Quoted 9 lines
drivers/input/misc/atlas_btns.c +0
-3@@ -156,13 +156,10 @@ static int __init atlas_acpi_init(void) {int result; -if (acpi_disabled) -return -ENODEV ; - result =acpi_bus_register_driver (&atlas_acpi_driver);if (result <0 ) {printk (KERN_ERR "Atlas ACPI: Unable to register driver\n" );
I think this printk is pointless.
Quoted 54 lines
drivers/input/misc/atlas_btns.c +1
-1-return -ENODEV ; +return result; }return 0 ;drivers/platform/x86/asus-laptop.c +0
-3@@ -1438,9 +1438,6 @@ static int __init asus_laptop_init(void) {int result; -if (acpi_disabled) -return -ENODEV ; - result =acpi_bus_register_driver (&asus_hotk_driver);if (result <0 )return result;drivers/platform/x86/asus_acpi.c +0
-3@@ -1416,9 +1416,6 @@ static int __init asus_acpi_init(void) {int result; -if (acpi_disabled) -return -ENODEV ; - asus_proc_dir =proc_mkdir (PROC_ASUS , acpi_root_dir);if (!asus_proc_dir) {printk (KERN_ERR "Asus ACPI: Unable to create /proc entry\n" );drivers/platform/x86/eeepc-laptop.c +0
-2@@ -1291,8 +1291,6 @@ static int __init eeepc_laptop_init(void) {int result; -if (acpi_disabled) -return -ENODEV ; result =acpi_bus_register_driver (&eeepc_hotk_driver);if (result <0 )return result;drivers/platform/x86/panasonic-laptop.c +0
-0@@ -678,16 +678,13 @@ out_hotkey:static int __init acpi_pcc_init (void ) {
drivers/platform/x86/panasonic-laptop.c out_hotkey: · line 686
Quoted 10 lines
drivers/platform/x86/panasonic-laptop.c +1
-4-int result =0 ; - -if (acpi_disabled) -return -ENODEV ; +int result; result =acpi_bus_register_driver (&acpi_pcc_driver);if (result <0 ) {ACPI_DEBUG_PRINT ((ACPI_DB_ERROR ,"Error registering hotkey driver\n" ));
Another (IMHO) pointless printk.
Quoted 19 lines
drivers/platform/x86/panasonic-laptop.c +1
-1-return -ENODEV ; +return result; }return 0 ;drivers/platform/x86/wmi.c +0
-3@@ -702,9 +702,6 @@ static int __init acpi_wmi_init(void)INIT_LIST_HEAD (&wmi_blocks.list); -if (acpi_disabled) -return -ENODEV ; - result =acpi_bus_register_driver (&acpi_wmi_driver);if (result <0 ) {
PATCH v2 4/4 ACPI: Remove unneccesary acpi_disabled checks in acpi drivers
acpi_bus_register_driver() already checks acpi_disabled, so acpi bus drivers don't need to. Pass on the return value when it fails instead of assuming ENODEV.
Also remove registration failure messages from a few drivers; they serve no obvious purpose and most drivers do without them.
---
v2:
- Remove printk("registration failed").
- Some module_init functions can now be reduced to a single line:
return acpi_bus_driver_register(&acpi_drv);
drivers/acpi/ac.c | 5 +---- drivers/acpi/acpi_memhotplug.c | 2 +- drivers/acpi/battery.c | 2 -- drivers/acpi/container.c | 4 ++-- drivers/acpi/ec.c | 2 +- drivers/acpi/fan.c | 2 +- drivers/acpi/pci_link.c | 11 ++++++----- drivers/acpi/power.c | 2 +- drivers/acpi/sbs.c | 4 +--- drivers/acpi/sbshc.c | 7 +------ drivers/acpi/thermal.c | 2 +- drivers/acpi/video.c | 2 +- drivers/hwmon/asus_atk0110.c | 8 +------- drivers/hwmon/hp_accel.c | 3 --- drivers/input/misc/atlas_btns.c | 13 +------------ drivers/platform/x86/asus-laptop.c | 3 --- drivers/platform/x86/asus_acpi.c | 3 --- drivers/platform/x86/eeepc-laptop.c | 2 -- drivers/platform/x86/panasonic-laptop.c | 14 +------------- drivers/platform/x86/wmi.c | 3 --- 20 files changed, 20 insertions(+), 74 deletions(-)
drivers/acpi/ac.c +1 -4
@@ -338,9 +338,6 @@ static int __init acpi_ac_init(void) {int result; -if (acpi_disabled) -return -ENODEV ; -#ifdef CONFIG_ACPI_PROCFS_POWER acpi_ac_dir =acpi_lock_ac_dir ();if (!acpi_ac_dir)
@@ -352,7 +349,7 @@ static int __init acpi_ac_init(void)#ifdef CONFIG_ACPI_PROCFS_POWER acpi_unlock_ac_dir (acpi_ac_dir);#endif -return -ENODEV ; +return result; }return 0 ;
drivers/acpi/acpi_memhotplug.c +1 -1
@@ -526,7 +526,7 @@ static int __init acpi_memory_device_init(void) result =acpi_bus_register_driver (&acpi_memory_device_driver);if (result <0 ) -return -ENODEV ; +return result; status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
drivers/acpi/battery.c +0 -2
@@ -907,8 +907,6 @@ static struct acpi_driver acpi_battery_driver = {static void __init acpi_battery_init_async (void *unused,async_cookie_t cookie) { -if (acpi_disabled) -return ;#ifdef CONFIG_ACPI_PROCFS_POWER acpi_battery_dir =acpi_lock_battery_dir ();if (!acpi_battery_dir)
drivers/acpi/container.c +2 -2
@@ -245,7 +245,7 @@ static int __init acpi_container_init(void) result =acpi_bus_register_driver (&acpi_container_driver);if (result <0 ) { -return (result); +return result; }/* register notify handler to every container device */
@@ -254,7 +254,7 @@ static int __init acpi_container_init(void)ACPI_UINT32_MAX , container_walk_namespace_cb, &action, NULL); -return (0 ); +return 0 ; } static void __exit acpi_container_exit(void)
drivers/acpi/ec.c +1 -1
@@ -1010,7 +1010,7 @@ int __init acpi_ec_init(void) result =acpi_bus_register_driver (&acpi_ec_driver);if (result <0 ) {remove_proc_entry (ACPI_EC_CLASS , acpi_root_dir); -return -ENODEV ; +return result; }return result;
drivers/acpi/fan.c +1 -1
@@ -345,7 +345,7 @@ static int __init acpi_fan_init(void) result =acpi_bus_register_driver (&acpi_fan_driver);if (result <0 ) {remove_proc_entry (ACPI_FAN_CLASS , acpi_root_dir); -return -ENODEV ; +return result; }return 0 ;
drivers/acpi/pci_link.c +6 -5
@@ -769,9 +769,7 @@ static int irqrouter_resume(struct sys_device *dev)static int acpi_pci_link_remove (struct acpi_device *device,int type) { -struct acpi_pci_link *link; - - link =acpi_driver_data (device); +struct acpi_pci_link *link =acpi_driver_data (device);mutex_lock (&acpi_link_lock);list_del (&link->list);
@@ -900,6 +898,8 @@ device_initcall(irqrouter_init_sysfs);static int __init acpi_pci_link_init (void ) { +int result; +if (acpi_noirq)return 0 ;
@@ -911,8 +911,9 @@ static int __init acpi_pci_link_init(void) acpi_irq_balance =0 ; } -if (acpi_bus_register_driver (&acpi_pci_link_driver) <0 ) -return -ENODEV ; + result =acpi_bus_register_driver (&acpi_pci_link_driver); +if (result <0 ) +return result;return 0 ; }
drivers/acpi/power.c +1 -1
@@ -747,7 +747,7 @@ int __init acpi_power_init(void) result =acpi_bus_register_driver (&acpi_power_driver);if (result <0 ) {remove_proc_entry (ACPI_POWER_CLASS , acpi_root_dir); -return -ENODEV ; +return result; }return 0 ;
drivers/acpi/sbs.c +1 -3
@@ -1013,8 +1013,6 @@ static int __init acpi_sbs_init(void) {int result =0 ; -if (acpi_disabled) -return -ENODEV ;#ifdef CONFIG_ACPI_PROCFS_POWER acpi_ac_dir =acpi_lock_ac_dir ();if (!acpi_ac_dir)
@@ -1028,7 +1026,7 @@ static int __init acpi_sbs_init(void) result =acpi_bus_register_driver (&acpi_sbs_driver);if (result <0 ) {acpi_sbs_rmdirs (); -return -ENODEV ; +return result; }return 0 ; }
drivers/acpi/sbshc.c +1 -6
@@ -302,12 +302,7 @@ static int acpi_smbus_hc_remove(struct acpi_device *device, int type)static int __init acpi_smb_hc_init (void ) { -int result; - - result =acpi_bus_register_driver (&acpi_smb_hc_driver); -if (result <0 ) -return -ENODEV ; -return 0 ; +return acpi_bus_register_driver (&acpi_smb_hc_driver); } static void __exit acpi_smb_hc_exit(void)
drivers/acpi/thermal.c +1 -1
@@ -1534,7 +1534,7 @@ static int __init acpi_thermal_init(void) result =acpi_bus_register_driver (&acpi_thermal_driver);if (result <0 ) {remove_proc_entry (ACPI_THERMAL_CLASS , acpi_root_dir); -return -ENODEV ; +return result; }return 0 ;
drivers/acpi/video.c +1 -1
@@ -2398,7 +2398,7 @@ int acpi_video_register(void) result =acpi_bus_register_driver (&acpi_video_bus);if (result <0 ) {remove_proc_entry (ACPI_VIDEO_CLASS , acpi_root_dir); -return -ENODEV ; +return result; }/*
drivers/hwmon/asus_atk0110.c +1 -7
@@ -993,13 +993,7 @@ static int atk_remove(struct acpi_device *device, int type)static int __init atk0110_init (void ) { -int ret; - - ret =acpi_bus_register_driver (&atk_driver); -if (ret) -pr_info ("atk: acpi_bus_register_driver failed: %d\n" , ret); - -return ret; +return acpi_bus_register_driver (&atk_driver); } static void __exit atk0110_exit(void)
drivers/hwmon/hp_accel.c +0 -3
@@ -357,9 +357,6 @@ static int __init lis3lv02d_init_module(void) {int ret; -if (acpi_disabled) -return -ENODEV ; - ret =acpi_bus_register_driver (&lis3lv02d_driver);if (ret <0 )return ret;
drivers/input/misc/atlas_btns.c +1 -12
@@ -154,18 +154,7 @@ static struct acpi_driver atlas_acpi_driver = {static int __init atlas_acpi_init (void ) { -int result; - -if (acpi_disabled) -return -ENODEV ; - - result =acpi_bus_register_driver (&atlas_acpi_driver); -if (result <0 ) { -printk (KERN_ERR "Atlas ACPI: Unable to register driver\n" ); -return -ENODEV ; - } - -return 0 ; +return acpi_bus_register_driver (&atlas_acpi_driver); } static void __exit atlas_acpi_exit(void)
drivers/platform/x86/asus-laptop.c +0 -3
@@ -1438,9 +1438,6 @@ static int __init asus_laptop_init(void) {int result; -if (acpi_disabled) -return -ENODEV ; - result =acpi_bus_register_driver (&asus_hotk_driver);if (result <0 )return result;
drivers/platform/x86/asus_acpi.c +0 -3
@@ -1416,9 +1416,6 @@ static int __init asus_acpi_init(void) {int result; -if (acpi_disabled) -return -ENODEV ; - asus_proc_dir =proc_mkdir (PROC_ASUS , acpi_root_dir);if (!asus_proc_dir) {printk (KERN_ERR "Asus ACPI: Unable to create /proc entry\n" );
drivers/platform/x86/eeepc-laptop.c +0 -2
@@ -1291,8 +1291,6 @@ static int __init eeepc_laptop_init(void) {int result; -if (acpi_disabled) -return -ENODEV ; result =acpi_bus_register_driver (&eeepc_hotk_driver);if (result <0 )return result;
drivers/platform/x86/panasonic-laptop.c +1 -13
@@ -678,19 +678,7 @@ out_hotkey:static int __init acpi_pcc_init (void ) { -int result =0 ; - -if (acpi_disabled) -return -ENODEV ; - - result =acpi_bus_register_driver (&acpi_pcc_driver); -if (result <0 ) { -ACPI_DEBUG_PRINT ((ACPI_DB_ERROR , -"Error registering hotkey driver\n" )); -return -ENODEV ; - } - -return 0 ; +return acpi_bus_register_driver (&acpi_pcc_driver); }static int acpi_pcc_hotkey_remove (struct acpi_device *device,int type)
drivers/platform/x86/wmi.c +0 -3
@@ -702,9 +702,6 @@ static int __init acpi_wmi_init(void)INIT_LIST_HEAD (&wmi_blocks.list); -if (acpi_disabled) -return -ENODEV ; - result =acpi_bus_register_driver (&acpi_wmi_driver);if (result <0 ) {
Signature · 1 line
1.6.3.2