Commit 1e0cb59d authored Sep 30, 2020 by John Garry Committed by Rafael J. Wysocki Oct 02, 2020

ACPI: Make acpi_evaluate_dsm() prototype consistent



When compiling a driver which includes both include/linux/acpi.h and
include/acpi/acpi_bus.h for when CONFIG_ACPI=n for i386, I get this:

/include/acpi/acpi_bus.h:53:20: error: conflicting types for ‘acpi_evaluate_dsm’
 union acpi_object *acpi_evaluate_dsm(acpi_handle handle, const guid_t *guid,
                    ^~~~~~~~~~~~~~~~~
In file included from drivers/scsi/hisi_sas/hisi_sas.h:10:0,
                 from drivers/scsi/hisi_sas/hisi_sas_main.c:7:
./include/linux/acpi.h:866:34: note: previous definition of ‘acpi_evaluate_dsm’ was here
 static inline union acpi_object *acpi_evaluate_dsm(acpi_handle handle,
                                  ^~~~~~~~~~~~~~~~~
Fix by making prototype in include/linux/acpi.h consistent.

Signed-off-by: John Garry <john.garry@huawei.com>
[ rjw: Subject edit ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 77569c75

include/linux/acpi.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -865,7 +865,7 @@ static inline bool acpi_driver_match_device(struct device *dev,

		static inline union acpi_object *acpi_evaluate_dsm(acpi_handle handle,
		const guid_t *guid,
		int rev, int func,
		u64 rev, u64 func,
		union acpi_object *argv4)
		{
		return NULL;

Admin message