acpi: remove redundant NULL checks in acpi drivers
Subsystems (7)
RFC 1/1 acpi: remove redundant NULL checks in acpi drivers
Hi
I noticed a pattern of unnecessary checks, and wrote some semantic patches to remove them (using the spatch tool). Here are the results, modulo some manual adjustment of blank lines to try and preserve the coding style in different files.
Would you be interested in accepting this? Can I submit it like this, or should I break it up somehow?
Regards
Alan
------------------------------
Quoted 1 line
From
5d501848505d36a7b432fa41805a7335bdee20bdMon Sep 17 00:00:00 2001
From: Alan Jenkins <[email protected]>
Date: Fri, 4 Sep 2009 10:18:59 +0100
Subject: [PATCH] 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.
--- drivers/acpi/ac.c | 14 ++++---------- drivers/acpi/acpi_memhotplug.c | 9 ++------- drivers/acpi/battery.c | 10 +++------- drivers/acpi/container.c | 5 ----- drivers/acpi/ec.c | 3 --- drivers/acpi/fan.c | 9 --------- drivers/acpi/power.c | 15 ++++----------- drivers/acpi/processor_core.c | 6 ++---- drivers/acpi/sbs.c | 4 ---- drivers/acpi/sbshc.c | 6 ------ drivers/acpi/thermal.c | 15 ++++----------- drivers/acpi/video.c | 12 ++++-------- drivers/hwmon/hp_accel.c | 6 ------ drivers/platform/x86/asus-laptop.c | 5 +---- drivers/platform/x86/asus_acpi.c | 5 +---- drivers/platform/x86/eeepc-laptop.c | 4 +--- drivers/platform/x86/fujitsu-laptop.c | 6 ------ drivers/platform/x86/intel_menlow.c | 5 +---- drivers/platform/x86/panasonic-laptop.c | 7 ++----- 19 files changed, 29 insertions(+), 117 deletions(-)
drivers/acpi/ac.c +4 -10
@@ -259,9 +259,6 @@ static int acpi_ac_add(struct acpi_device *device)struct acpi_ac *ac =NULL ; -if (!device) -return -EINVAL ; - ac =kzalloc (sizeof (struct acpi_ac ),GFP_KERNEL );if (!ac)return -ENOMEM ;
@@ -306,11 +303,10 @@ 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)) +if (!ac)return -EINVAL ; - ac =acpi_driver_data (device); old_state = ac->state;if (acpi_ac_get_state (ac))return 0 ;
@@ -323,14 +319,12 @@ 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 ; +struct acpi_ac *ac =acpi_driver_data (device); -if (!device || !acpi_driver_data (device)) +if (!ac)return -EINVAL ; - ac =acpi_driver_data (device); -#ifdef CONFIG_ACPI_SYSFS_POWER if (ac->charger.dev)power_supply_unregister (&ac->charger);
drivers/acpi/acpi_memhotplug.c +2 -7
@@ -404,9 +404,6 @@ static int acpi_memory_device_add(struct acpi_device *device)struct acpi_memory_device *mem_device =NULL ; -if (!device) -return -EINVAL ; - mem_device =kzalloc (sizeof (struct acpi_memory_device ),GFP_KERNEL );if (!mem_device)return -ENOMEM ;
@@ -450,13 +447,11 @@ 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)) +if (!mem_device)return -EINVAL ; - - mem_device =acpi_driver_data (device);kfree (mem_device);return 0 ;
drivers/acpi/battery.c +3 -7
@@ -841,8 +841,7 @@ static int acpi_battery_add(struct acpi_device *device) {int result =0 ;struct acpi_battery *battery =NULL ; -if (!device) -return -EINVAL ; + battery =kzalloc (sizeof (struct acpi_battery ),GFP_KERNEL );if (!battery)return -ENOMEM ;
@@ -870,11 +869,10 @@ 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)) +if (!battery)return -EINVAL ; - battery =acpi_driver_data (device);#ifdef CONFIG_ACPI_PROCFS_POWER acpi_battery_remove_fs (device);#endif
@@ -890,8 +888,6 @@ static int acpi_battery_remove(struct acpi_device *device, int type)static int acpi_battery_resume (struct acpi_device *device) {struct acpi_battery *battery; -if (!device) -return -EINVAL ; battery =acpi_driver_data (device); battery->update_time =0 ;acpi_battery_update (battery);
drivers/acpi/container.c +0 -5
@@ -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 ;
drivers/acpi/ec.c +0 -3
@@ -840,9 +840,6 @@ static int acpi_ec_remove(struct acpi_device *device, int type)struct acpi_ec *ec;struct acpi_ec_query_handler *handler, *tmp; -if (!device) -return -EINVAL ; - ec =acpi_driver_data (device);ec_remove_handlers (ec);mutex_lock (&ec->lock);
drivers/acpi/fan.c +0 -9
@@ -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 );
@@ -313,9 +310,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 +320,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 +4 -11
@@ -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,13 @@ 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)) +if (!resource)return -EINVAL ; - resource =acpi_driver_data (device); -acpi_power_remove_fs (device);mutex_lock (&resource->resource_lock);
@@ -722,14 +717,12 @@ 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)) +if (!resource)return -EINVAL ; - resource =acpi_driver_data (device); - result =acpi_power_get_state (device->handle, &state);if (result)return result;
drivers/acpi/processor_core.c +2 -4
@@ -888,14 +888,12 @@ err_free_cpumask:static int acpi_processor_remove (struct acpi_device *device,int type) { -struct acpi_processor *pr =NULL ; +struct acpi_processor *pr =acpi_driver_data (device); -if (!device || !acpi_driver_data (device)) +if (!pr)return -EINVAL ; - pr =acpi_driver_data (device); -if (pr->id >= nr_cpu_ids) goto free;
drivers/acpi/sbs.c +0 -4
@@ -963,8 +963,6 @@ static int acpi_sbs_remove(struct acpi_device *device, int type)struct acpi_sbs *sbs;int id; -if (!device) -return -EINVAL ; sbs =acpi_driver_data (device);if (!sbs)return -EINVAL ;
@@ -996,8 +994,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 +0 -6
@@ -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");
@@ -298,9 +295,6 @@ static int acpi_smbus_hc_remove(struct acpi_device *device, int type) {struct acpi_smb_hc *hc; -if (!device) -return -EINVAL ; - hc =acpi_driver_data (device);acpi_ec_remove_query_handler (hc->ec, hc->query_bit);kfree (hc);
drivers/acpi/thermal.c +4 -11
@@ -1364,9 +1364,6 @@ static int acpi_thermal_add(struct acpi_device *device)struct acpi_thermal *tz =NULL ; -if (!device) -return -EINVAL ; - tz =kzalloc (sizeof (struct acpi_thermal ),GFP_KERNEL );if (!tz)return -ENOMEM ;
@@ -1408,13 +1405,11 @@ end:static int acpi_thermal_remove (struct acpi_device *device,int type) { -struct acpi_thermal *tz =NULL ; +struct acpi_thermal *tz =acpi_driver_data (device); -if (!device || !acpi_driver_data (device)) +if (!tz)return -EINVAL ; - tz =acpi_driver_data (device); -acpi_thermal_remove_fs (device);acpi_thermal_unregister_thermal_zone (tz);mutex_destroy (&tz->lock);
@@ -1424,15 +1419,13 @@ 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)) +if (!tz)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 +4 -8
@@ -2207,15 +2207,13 @@ 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)) +if (!video)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)
@@ -2352,14 +2350,12 @@ 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 ; +struct acpi_video_bus *video =acpi_driver_data (device); -if (!device || !acpi_driver_data (device)) +if (!video)return -EINVAL ; - video =acpi_driver_data (device); -acpi_video_bus_stop_devices (video);acpi_video_bus_put_devices (video);acpi_video_bus_remove_fs (device);
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 +1 -4
@@ -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,7 +1303,7 @@ end:static int asus_hotk_remove (struct acpi_device *device,int type) { -if (!device || !acpi_driver_data (device)) +if (!acpi_driver_data (device))return -EINVAL ;kfree (hotk->name);
drivers/platform/x86/asus_acpi.c +1 -4
@@ -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,7 +1389,7 @@ end:static int asus_hotk_remove (struct acpi_device *device,int type) { -if (!device || !acpi_driver_data (device)) +if (!acpi_driver_data (device))return -EINVAL ;asus_hotk_remove_fs (device);
drivers/platform/x86/eeepc-laptop.c +1 -3
@@ -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,7 +1274,7 @@ fail_platform_driver:static int eeepc_hotk_remove (struct acpi_device *device,int type) { -if (!device || !acpi_driver_data (device)) +if (!acpi_driver_data (device))return -EINVAL ;eeepc_backlight_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 +1 -4
@@ -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,7 +197,7 @@ static int intel_menlow_memory_remove(struct acpi_device *device, int type) {struct thermal_cooling_device *cdev =acpi_driver_data (device); -if (!device || !cdev) +if (!cdev)return -EINVAL ;sysfs_remove_link (&device->dev.kobj,"thermal_cooling" );
drivers/platform/x86/panasonic-laptop.c +2 -5
@@ -588,7 +588,7 @@ 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 ) +if (pcc ==NULL )return -EINVAL ; ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Sticky mode restore: %d\n",
@@ -604,9 +604,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,7 +700,7 @@ static int acpi_pcc_hotkey_remove(struct acpi_device *device, int type) {struct pcc_acpi *pcc =acpi_driver_data (device); -if (!device || !pcc) +if (!pcc)return -EINVAL ;sysfs_remove_group (&device->dev.kobj, &pcc_attr_group);
Signature · 1 line
1.6.3.2
Quoted 7 lines · Alan Jenkins
I noticed a pattern of unnecessary checks, and wrote some semantic patches to remove them (using the spatch tool). Here are the results, modulo some manual adjustment of blank lines to try and preserve the coding style in different files.
Would you be interested in accepting this? Can I submit it like this, or should I break it up somehow?
I'm generally in favor of removing these checks. In most cases, you can go even farther, for example:
drivers/acpi/ac.c static int acpi_ac_add(struct acpi_device *device) · line 259
Quoted 6 lines
drivers/acpi/ac.c +0
-0@@ -259,9 +259,6 @@ static int acpi_ac_add(struct acpi_device *device)struct acpi_ac *ac =NULL ;
The initialization of "ac" is useless since the first thing we do below is assign to it.
Quoted 7 lines
drivers/acpi/ac.c +0
-3-if (!device) -return -EINVAL ; - ac =kzalloc (sizeof (struct acpi_ac ),GFP_KERNEL );if (!ac)return -ENOMEM ;
drivers/acpi/ac.c static int acpi_ac_add(struct acpi_device *device) · line 309
Quoted 9 lines
drivers/acpi/ac.c +2
-2@@ -306,11 +303,10 @@ 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)) +if (!ac)return -EINVAL ;
I would also remove the test of "!ac". acpi_ac_resume() can only be called after acpi_ac_add() completes successfully, and acpi_ac_add() always sets "device->driver_data = ac".
So testing "!ac" here will only find memory corruption or a bug in the Linux/ACPI core. In either case, I think it's better to oops than to return -EINVAL, which will probably get ignored.
Bjorn