summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/dock.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-20 19:11:38 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-21 18:48:56 -0500
commitf311e1c4a6ea2347c8e167525f8a0fb9af9125ed (patch)
tree6bd50586116aa339a6250cd357a0a22a9b33a7e9 /drivers/acpi/dock.c
parent2f16817d87dcd3fc79e0320f6f0bd186b1ae6184 (diff)
ACPI / dock: Drop remove_dock_dependent_devices()
Since remove_dock_dependent_devices() is only called from acpi_dock_add() and it only is called if the add_dock_dependent_device() adding the dock station to its own list of dependent devices has failed, it is not really necessary, because the dock station's list of dependent devices is guaranteed to be empty at that point. Drop it, then. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/dock.c')
-rw-r--r--drivers/acpi/dock.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index f6fd325078b3..d9baeae09d31 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -114,16 +114,6 @@ static int add_dock_dependent_device(struct dock_station *ds,
114 return 0; 114 return 0;
115} 115}
116 116
117static void remove_dock_dependent_devices(struct dock_station *ds)
118{
119 struct dock_dependent_device *dd, *aux;
120
121 list_for_each_entry_safe(dd, aux, &ds->dependent_devices, list) {
122 list_del(&dd->list);
123 kfree(dd);
124 }
125}
126
127static void dock_hotplug_event(struct dock_dependent_device *dd, u32 event, 117static void dock_hotplug_event(struct dock_dependent_device *dd, u32 event,
128 enum dock_callback_type cb_type) 118 enum dock_callback_type cb_type)
129{ 119{
@@ -674,8 +664,8 @@ void acpi_dock_add(struct acpi_device *adev)
674 return; 664 return;
675 665
676err_rmgroup: 666err_rmgroup:
677 remove_dock_dependent_devices(dock_station);
678 sysfs_remove_group(&dd->dev.kobj, &dock_attribute_group); 667 sysfs_remove_group(&dd->dev.kobj, &dock_attribute_group);
668
679err_unregister: 669err_unregister:
680 platform_device_unregister(dd); 670 platform_device_unregister(dd);
681 acpi_handle_err(handle, "%s encountered error %d\n", __func__, ret); 671 acpi_handle_err(handle, "%s encountered error %d\n", __func__, ret);