ACPI / platform: drop redundant ACPI_HANDLE check (9383f4c6) · Commits · 戴 / test

The acpi_dev_pm_attach/_detach functions perform their own checks to ensure the device has an ACPI companion. It is not necessary for the caller to do so. This mirrors what other busses with ACPI dev PM support do (i2c, spi, sdio). Cc: Len Brown <lenb@kernel.org> Acked-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by:

Josh Cartwright <joshc@codeaurora.org> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/base/platform.c

+4 −7

Original line number	Diff line number	Diff line
		@@ -481,11 +481,10 @@ static int platform_drv_probe(struct device *_dev)
		struct platform_device *dev = to_platform_device(_dev);
		int ret;

		if (ACPI_HANDLE(_dev))
		acpi_dev_pm_attach(_dev, true);

		ret = drv->probe(dev);
		if (ret && ACPI_HANDLE(_dev))
		if (ret)
		acpi_dev_pm_detach(_dev, true);

		if (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) {
		@@ -508,7 +507,6 @@ static int platform_drv_remove(struct device *_dev)
		int ret;

		ret = drv->remove(dev);
		if (ACPI_HANDLE(_dev))
		acpi_dev_pm_detach(_dev, true);

		return ret;
		@@ -520,7 +518,6 @@ static void platform_drv_shutdown(struct device *_dev)
		struct platform_device *dev = to_platform_device(_dev);

		drv->shutdown(dev);
		if (ACPI_HANDLE(_dev))
		acpi_dev_pm_detach(_dev, true);
		}

Admin message