From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Chiang Subject: [PATCH v2 1/6] ACPI: dock: clean up error handling paths in dock_add() Date: Wed, 14 Oct 2009 16:46:16 -0600 Message-ID: <20091014224616.18044.45719.stgit@bob.kio> References: <20091014224415.18044.88208.stgit@bob.kio> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: Received: from g6t0185.atlanta.hp.com ([15.193.32.62]:36456 "EHLO g6t0185.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932113AbZJNWq6 (ORCPT ); Wed, 14 Oct 2009 18:46:58 -0400 In-Reply-To: <20091014224415.18044.88208.stgit@bob.kio> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: lenb@kernel.org Cc: shaohua.li@intel.com, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Remove some copy/paste code in our error handling paths, which makes the function smaller and slightly easier to read. Signed-off-by: Alex Chiang --- drivers/acpi/dock.c | 75 +++++++++++++++++++-------------------------------- 1 files changed, 28 insertions(+), 47 deletions(-) diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 7338b6a..642c7dd 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -968,11 +968,9 @@ static int dock_add(acpi_handle handle) platform_device_register_simple(dock_device_name, dock_station_count, NULL, 0); dock_device = dock_station->dock_device; - if (IS_ERR(dock_device)) { - kfree(dock_station); - dock_station = NULL; - return PTR_ERR(dock_device); - } + ret = IS_ERR(dock_device) ? PTR_ERR(dock_device) : 0; + if (ret) + goto out; platform_device_add_data(dock_device, &dock_station, sizeof(struct dock_station *)); @@ -987,46 +985,24 @@ static int dock_add(acpi_handle handle) dock_station->flags |= DOCK_IS_BAT; ret = device_create_file(&dock_device->dev, &dev_attr_docked); - if (ret) { - printk(KERN_ERR "Error %d adding sysfs file\n", ret); - platform_device_unregister(dock_device); - kfree(dock_station); - dock_station = NULL; - return ret; - } + if (ret) + goto err_unregister; + ret = device_create_file(&dock_device->dev, &dev_attr_undock); - if (ret) { - printk(KERN_ERR "Error %d adding sysfs file\n", ret); - device_remove_file(&dock_device->dev, &dev_attr_docked); - platform_device_unregister(dock_device); - kfree(dock_station); - dock_station = NULL; - return ret; - } + if (ret) + goto err_unregister1; + ret = device_create_file(&dock_device->dev, &dev_attr_uid); - if (ret) { - printk(KERN_ERR "Error %d adding sysfs file\n", ret); - device_remove_file(&dock_device->dev, &dev_attr_docked); - device_remove_file(&dock_device->dev, &dev_attr_undock); - platform_device_unregister(dock_device); - kfree(dock_station); - dock_station = NULL; - return ret; - } + if (ret) + goto err_unregister2; + ret = device_create_file(&dock_device->dev, &dev_attr_flags); - if (ret) { - printk(KERN_ERR "Error %d adding sysfs file\n", ret); - device_remove_file(&dock_device->dev, &dev_attr_docked); - device_remove_file(&dock_device->dev, &dev_attr_undock); - device_remove_file(&dock_device->dev, &dev_attr_uid); - platform_device_unregister(dock_device); - kfree(dock_station); - dock_station = NULL; - return ret; - } + if (ret) + goto err_unregister3; + ret = device_create_file(&dock_device->dev, &dev_attr_type); if (ret) - printk(KERN_ERR"Error %d adding sysfs file\n", ret); + goto err_unregister4; /* Find dependent devices */ acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, @@ -1036,10 +1012,8 @@ static int dock_add(acpi_handle handle) /* add the dock station as a device dependent on itself */ dd = alloc_dock_dependent_device(handle); if (!dd) { - kfree(dock_station); - dock_station = NULL; ret = -ENOMEM; - goto dock_add_err_unregister; + goto err_unregister5; } add_dock_dependent_device(dock_station, dd); @@ -1047,13 +1021,20 @@ static int dock_add(acpi_handle handle) list_add(&dock_station->sibling, &dock_stations); return 0; -dock_add_err_unregister: +err_unregister5: device_remove_file(&dock_device->dev, &dev_attr_type); - device_remove_file(&dock_device->dev, &dev_attr_docked); - device_remove_file(&dock_device->dev, &dev_attr_undock); - device_remove_file(&dock_device->dev, &dev_attr_uid); +err_unregister4: device_remove_file(&dock_device->dev, &dev_attr_flags); +err_unregister3: + device_remove_file(&dock_device->dev, &dev_attr_uid); +err_unregister2: + device_remove_file(&dock_device->dev, &dev_attr_undock); +err_unregister1: + device_remove_file(&dock_device->dev, &dev_attr_docked); +err_unregister: + printk(KERN_ERR "%s encountered error %d\n", __func__, ret); platform_device_unregister(dock_device); +out: kfree(dock_station); dock_station = NULL; return ret;