ACPI: Make acpi_evaluate_dsm() prototype consistent
authorJohn Garry <john.garry@huawei.com>
Wed, 30 Sep 2020 12:43:50 +0000 (13:43 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 2 Oct 2020 16:58:35 +0000 (18:58 +0200)
commit1e0cb59d5f0a41d1a2b7a1e7d45024fbac62d6e7
tree68ff51723a5d42f512a042924fc2db4c16226e7b
parent77569c7533a6c089c67874ad6d8b442f5c20be10
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>
include/linux/acpi.h