From: John Garry Date: Wed, 30 Sep 2020 12:43:50 +0000 (+0100) Subject: ACPI: Make acpi_evaluate_dsm() prototype consistent X-Git-Tag: v5.10-rc1~149^2~1^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e0cb59d5f0a41d1a2b7a1e7d45024fbac62d6e7;p=thirdparty%2Fkernel%2Flinux.git 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 [ rjw: Subject edit ] Signed-off-by: Rafael J. Wysocki --- diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 7ce2235f99f9a..49dbb105084f5 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -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;