Skip to content

Commit 2c5a06e

Browse files
kirankrishnappa-intelrafaeljw
authored andcommitted
ACPI: utils: Fix acpi_evaluate_dsm_typed() redefinition error
acpi_evaluate_dsm_typed() needs to be gaurded with CONFIG_ACPI to avoid a redefintion error when the stub is also enabled. In file included from ../drivers/bluetooth/btintel.c:13: ../include/acpi/acpi_bus.h:57:1: error: redefinition of 'acpi_evaluate_dsm_typed' 57 | acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid,.. | ^~~~~~~~~~~~~~~~~~~~~~~ In file included from ../drivers/bluetooth/btintel.c:12: ../include/linux/acpi.h:967:34: note: previous definition of 'acpi_evaluate_dsm_typed' with type 'union acpi_object *(void *, const guid_t *, u64, u64, union acpi_object *, acpi_object_type)' {aka 'union acpi_object *(void *, const guid_t *, long long unsigned int, long long unsigned int, union acpi_object *, unsigned int)'} 967 | static inline union acpi_object *acpi_evaluate_dsm_typed(acpi_handle handle, Fixes: 1b94ad7 ("ACPI: utils: Add acpi_evaluate_dsm_typed() and acpi_check_dsm() stubs") Signed-off-by: Kiran K <kiran.k@intel.com> [ rjw: Subject and changelog edits ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent e8d018d commit 2c5a06e

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

include/acpi/acpi_bus.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ bool acpi_dock_match(acpi_handle handle);
5252
bool acpi_check_dsm(acpi_handle handle, const guid_t *guid, u64 rev, u64 funcs);
5353
union acpi_object *acpi_evaluate_dsm(acpi_handle handle, const guid_t *guid,
5454
u64 rev, u64 func, union acpi_object *argv4);
55-
55+
#ifdef CONFIG_ACPI
5656
static inline union acpi_object *
5757
acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid, u64 rev,
5858
u64 func, union acpi_object *argv4,
@@ -68,6 +68,7 @@ acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid, u64 rev,
6868

6969
return obj;
7070
}
71+
#endif
7172

7273
#define ACPI_INIT_DSM_ARGV4(cnt, eles) \
7374
{ \

0 commit comments

Comments
 (0)