ACPI: dock: convert sysfs attributes to an attribute_group

As suggested by Dmitry Torokhov, convert the individual sysfs
attributes into an attribute group.

This change eliminates quite a bit of copy/paste code in the
error handling paths.

Signed-off-by: Alex Chiang <achiang@hp.com>
Reviewed-by: Dmitry Torokhov <dtor@mail.ru>
Acked-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 24 insertions, 57 deletions

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 7338b6a3e049..4f2aa98e2cee 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -936,6 +936,19 @@ static ssize_t show_dock_type(struct device *dev,
 }
 static DEVICE_ATTR(type, S_IRUGO, show_dock_type, NULL);
 
+static struct attribute *dock_attributes[] = {
+        &dev_attr_docked.attr,
+        &dev_attr_flags.attr,
+        &dev_attr_undock.attr,
+        &dev_attr_uid.attr,
+        &dev_attr_type.attr,
+        NULL
+};
+
+static struct attribute_group dock_attribute_group = {
+        .attrs = dock_attributes
+};
+
 /**
  * dock_add - add a new dock station
  * @handle: the dock station handle
@@ -969,9 +982,8 @@ static int dock_add(acpi_handle handle)
                         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 = PTR_ERR(dock_device);
+                goto out;
         }
         platform_device_add_data(dock_device, &dock_station,
                 sizeof(struct dock_station *));
@@ -986,47 +998,9 @@ static int dock_add(acpi_handle handle)
         if (is_battery(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;
-        }
-        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;
-        }
-        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;
-        }
-        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;
-        }
-        ret = device_create_file(&dock_device->dev, &dev_attr_type);
+        ret = sysfs_create_group(&dock_device->dev.kobj, &dock_attribute_group);
         if (ret)
-                printk(KERN_ERR"Error %d adding sysfs file\n", ret);
+                goto err_unregister;
 
         /* Find dependent devices */
         acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
@@ -1036,10 +1010,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_rmgroup;
         }
         add_dock_dependent_device(dock_station, dd);
 
@@ -1047,15 +1019,14 @@ static int dock_add(acpi_handle handle)
         list_add(&dock_station->sibling, &dock_stations);
         return 0;
 
-dock_add_err_unregister:
-        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);
-        device_remove_file(&dock_device->dev, &dev_attr_flags);
+err_rmgroup:
+        sysfs_remove_group(&dock_device->dev.kobj, &dock_attribute_group);
+err_unregister:
         platform_device_unregister(dock_device);
+out:
         kfree(dock_station);
         dock_station = NULL;
+        printk(KERN_ERR "%s encountered error %d\n", __func__, ret);
         return ret;
 }
 
@@ -1076,11 +1047,7 @@ static int dock_remove(struct dock_station *dock_station)
             kfree(dd);
 
         /* cleanup sysfs */
-        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);
-        device_remove_file(&dock_device->dev, &dev_attr_flags);
+        sysfs_remove_group(&dock_device->dev.kobj, &dock_attribute_group);
         platform_device_unregister(dock_device);
 
         /* free dock station memory */