ACPI / dock: Drop remove_dock_dependent_devices() (f311e1c4) · Commits · 戴 / test

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>

drivers/acpi/dock.c

+1 −11

Original line number	Diff line number	Diff line
		@@ -114,16 +114,6 @@ static int add_dock_dependent_device(struct dock_station *ds,
		return 0;
		}

		static void remove_dock_dependent_devices(struct dock_station *ds)
		{
		struct dock_dependent_device dd, aux;

		list_for_each_entry_safe(dd, aux, &ds->dependent_devices, list) {
		list_del(&dd->list);
		kfree(dd);
		}
		}

		static void dock_hotplug_event(struct dock_dependent_device *dd, u32 event,
		enum dock_callback_type cb_type)
		{
		@@ -674,8 +664,8 @@ void acpi_dock_add(struct acpi_device *adev)
		return;

		err_rmgroup:
		remove_dock_dependent_devices(dock_station);
		sysfs_remove_group(&dd->dev.kobj, &dock_attribute_group);

		err_unregister:
		platform_device_unregister(dd);
		acpi_handle_err(handle, "%s encountered error %d\n", __func__, ret);

Admin message