Skip to content

Commit 1e0cb59

Browse files
John Garryrafaeljw
authored andcommitted
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>
1 parent 77569c7 commit 1e0cb59

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

include/linux/acpi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ static inline bool acpi_driver_match_device(struct device *dev,
865865

866866
static inline union acpi_object *acpi_evaluate_dsm(acpi_handle handle,
867867
const guid_t *guid,
868-
int rev, int func,
868+
u64 rev, u64 func,
869869
union acpi_object *argv4)
870870
{
871871
return NULL;

0 commit comments

Comments
 (0)