diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-08-11 19:21:03 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-08-11 19:21:03 +0200 |
| commit | da2679f26bd6ae20b06d49e53eedc2880cf5e65e (patch) | |
| tree | 103108c9e94b2be81fd9467117f0f678db896636 /include/linux/acpi.h | |
| parent | b0f2fe5a38389790a97334c5df1c5dec52c5d627 (diff) | |
| parent | 46981fa78490e16589559cec8c762e5527d665d2 (diff) | |
Merge branch 'acpi-properties'
Merge changes adding support for device properties with buffer values
to the ACPI device properties handling code.
* acpi-properties:
ACPI: property: Fix error handling in acpi_init_properties()
ACPI: property: Read buffer properties as integers
ACPI: property: Add support for parsing buffer property UUID
ACPI: property: Unify integer value reading functions
ACPI: property: Switch node property referencing from ifs to a switch
ACPI: property: Move property ref argument parsing into a new function
ACPI: property: Use acpi_object_type consistently in property ref parsing
ACPI: property: Tie data nodes to acpi handles
ACPI: property: Return type of acpi_add_nondev_subnodes() should be bool
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 7e7a33b6c8d7..ce00cca3f1bd 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1245,7 +1245,7 @@ static inline bool acpi_dev_has_props(const struct acpi_device *adev) struct acpi_device_properties * acpi_data_add_props(struct acpi_device_data *data, const guid_t *guid, - const union acpi_object *properties); + union acpi_object *properties); int acpi_node_prop_get(const struct fwnode_handle *fwnode, const char *propname, void **valptr); |