ACPI: EC: remove .stop() method (cf745ec7) · Commits · 戴 / test

This patch folds the .stop() method into .remove(). acpi_ec_stop() is only called via acpi_device_probe() and acpi_device_remove(), and in both cases it is called immediately before acpi_ec_remove(), so there's no need to have it be a separate method. Signed-off-by:

Bjorn Helgaas <bjorn.helgaas@hp.com> Reviewed-by:

Alex Chiang <achiang@hp.com> CC: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by:

Len Brown <len.brown@intel.com>

drivers/acpi/ec.c

+1 −14

Original line number	Diff line number	Diff line
		@@ -891,6 +891,7 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
		return -EINVAL;

		ec = acpi_driver_data(device);
		ec_remove_handlers(ec);
		mutex_lock(&ec->lock);
		list_for_each_entry_safe(handler, tmp, &ec->list, node) {
		list_del(&handler->node);
		@@ -928,19 +929,6 @@ ec_parse_io_ports(struct acpi_resource resource, void context)
		return AE_OK;
		}

		static int acpi_ec_stop(struct acpi_device *device, int type)
		{
		struct acpi_ec *ec;
		if (!device)
		return -EINVAL;
		ec = acpi_driver_data(device);
		if (!ec)
		return -EINVAL;
		ec_remove_handlers(ec);

		return 0;
		}

		int __init acpi_boot_ec_enable(void)
		{
		if (!boot_ec \|\| test_bit(EC_FLAGS_HANDLERS_INSTALLED, &boot_ec->flags))
		@@ -1061,7 +1049,6 @@ static struct acpi_driver acpi_ec_driver = {
		.ops = {
		.add = acpi_ec_add,
		.remove = acpi_ec_remove,
		.stop = acpi_ec_stop,
		.suspend = acpi_ec_suspend,
		.resume = acpi_ec_resume,
		},

Admin message