diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-29 14:04:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-29 14:04:37 -0700 |
| commit | 349a2d52ffe59b7a0c5876fa7ee9f3eaf188b830 (patch) | |
| tree | 7eaa2766a49583546a4627114ce2341ba9c82365 /drivers/acpi | |
| parent | 72ad9f9d215397aa0ffacf88c5f7e020b856d47f (diff) | |
| parent | fb38f314fbd173e2e9f9f0f2e720a5f4889562da (diff) | |
| download | linux-349a2d52ffe59b7a0c5876fa7ee9f3eaf188b830.tar.bz2 | |
Merge tag 'devprop-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull device properties framework updates from Rafael Wysocki:
"These unify device properties access in some pieces of code and make
related changes.
Specifics:
- Handle device properties with software node API in the ACPI IORT
table parsing code (Heikki Krogerus).
- Unify of_node access in the common device properties code, constify
the acpi_dma_supported() argument pointer and fix up CONFIG_ACPI=n
stubs of some functions related to device properties (Andy
Shevchenko)"
* tag 'devprop-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
device property: Unify access to of_node
ACPI: scan: Constify acpi_dma_supported() helper function
ACPI: property: Constify stubs for CONFIG_ACPI=n case
ACPI: IORT: Handle device properties with software node API
device property: Retrieve fwnode from of_node via accessor
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/arm64/iort.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/scan.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index 3912a1f6058e..e34937e11186 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -976,7 +976,7 @@ static void iort_named_component_init(struct device *dev, FIELD_GET(ACPI_IORT_NC_PASID_BITS, nc->node_flags)); - if (device_add_properties(dev, props)) + if (device_create_managed_software_node(dev, props, NULL)) dev_warn(dev, "Could not add device properties\n"); } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 57507b643afd..0641bc20b097 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1411,7 +1411,7 @@ void acpi_free_pnp_ids(struct acpi_device_pnp *pnp) * * Return false if DMA is not supported. Otherwise, return true */ -bool acpi_dma_supported(struct acpi_device *adev) +bool acpi_dma_supported(const struct acpi_device *adev) { if (!adev) return false; |