Commit 5f46c2f2 authored by Alex Chiang's avatar Alex Chiang Committed by Len Brown

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: default avatarAlex Chiang <achiang@hp.com>
Reviewed-by: default avatarDmitry Torokhov <dtor@mail.ru>
Acked-by: default avatarShaohua Li <shaohua.li@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 012abeea
...@@ -936,6 +936,19 @@ static ssize_t show_dock_type(struct device *dev, ...@@ -936,6 +936,19 @@ static ssize_t show_dock_type(struct device *dev,
} }
static DEVICE_ATTR(type, S_IRUGO, show_dock_type, NULL); 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 * dock_add - add a new dock station
* @handle: the dock station handle * @handle: the dock station handle
...@@ -969,9 +982,8 @@ static int dock_add(acpi_handle handle) ...@@ -969,9 +982,8 @@ static int dock_add(acpi_handle handle)
dock_station_count, NULL, 0); dock_station_count, NULL, 0);
dock_device = dock_station->dock_device; dock_device = dock_station->dock_device;
if (IS_ERR(dock_device)) { if (IS_ERR(dock_device)) {
kfree(dock_station); ret = PTR_ERR(dock_device);
dock_station = NULL; goto out;
return PTR_ERR(dock_device);
} }
platform_device_add_data(dock_device, &dock_station, platform_device_add_data(dock_device, &dock_station,
sizeof(struct dock_station *)); sizeof(struct dock_station *));
...@@ -986,47 +998,9 @@ static int dock_add(acpi_handle handle) ...@@ -986,47 +998,9 @@ static int dock_add(acpi_handle handle)
if (is_battery(handle)) if (is_battery(handle))
dock_station->flags |= DOCK_IS_BAT; dock_station->flags |= DOCK_IS_BAT;
ret = device_create_file(&dock_device->dev, &dev_attr_docked); ret = sysfs_create_group(&dock_device->dev.kobj, &dock_attribute_group);
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);
if (ret) if (ret)
printk(KERN_ERR"Error %d adding sysfs file\n", ret); goto err_unregister;
/* Find dependent devices */ /* Find dependent devices */
acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
...@@ -1036,10 +1010,8 @@ static int dock_add(acpi_handle handle) ...@@ -1036,10 +1010,8 @@ static int dock_add(acpi_handle handle)
/* add the dock station as a device dependent on itself */ /* add the dock station as a device dependent on itself */
dd = alloc_dock_dependent_device(handle); dd = alloc_dock_dependent_device(handle);
if (!dd) { if (!dd) {
kfree(dock_station);
dock_station = NULL;
ret = -ENOMEM; ret = -ENOMEM;
goto dock_add_err_unregister; goto err_rmgroup;
} }
add_dock_dependent_device(dock_station, dd); add_dock_dependent_device(dock_station, dd);
...@@ -1047,15 +1019,14 @@ static int dock_add(acpi_handle handle) ...@@ -1047,15 +1019,14 @@ static int dock_add(acpi_handle handle)
list_add(&dock_station->sibling, &dock_stations); list_add(&dock_station->sibling, &dock_stations);
return 0; return 0;
dock_add_err_unregister: err_rmgroup:
device_remove_file(&dock_device->dev, &dev_attr_type); sysfs_remove_group(&dock_device->dev.kobj, &dock_attribute_group);
device_remove_file(&dock_device->dev, &dev_attr_docked); err_unregister:
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);
platform_device_unregister(dock_device); platform_device_unregister(dock_device);
out:
kfree(dock_station); kfree(dock_station);
dock_station = NULL; dock_station = NULL;
printk(KERN_ERR "%s encountered error %d\n", __func__, ret);
return ret; return ret;
} }
...@@ -1076,11 +1047,7 @@ static int dock_remove(struct dock_station *dock_station) ...@@ -1076,11 +1047,7 @@ static int dock_remove(struct dock_station *dock_station)
kfree(dd); kfree(dd);
/* cleanup sysfs */ /* cleanup sysfs */
device_remove_file(&dock_device->dev, &dev_attr_type); sysfs_remove_group(&dock_device->dev.kobj, &dock_attribute_group);
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);
platform_device_unregister(dock_device); platform_device_unregister(dock_device);
/* free dock station memory */ /* free dock station memory */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment