diff options
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/arm64/apmt.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/arm64/iort.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/bus.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/arm64/apmt.c b/drivers/acpi/arm64/apmt.c index 91fcdd289..8ad049f81 100644 --- a/drivers/acpi/arm64/apmt.c +++ b/drivers/acpi/arm64/apmt.c @@ -101,7 +101,7 @@ static int __init apmt_add_platform_device(struct acpi_apmt_node *node, if (ret) goto dev_put; - pdev->dev.fwnode = fwnode; + platform_device_set_fwnode(pdev, fwnode); ret = platform_device_add(pdev); diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index 34412cd69..1020ac953 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -1992,7 +1992,7 @@ static int __init iort_add_platform_device(struct acpi_iort_node *node, goto dev_put; } - pdev->dev.fwnode = fwnode; + platform_device_set_fwnode(pdev, fwnode); if (ops->dev_dma_configure) ops->dev_dma_configure(&pdev->dev, node); diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index c1876f145..beb51151a 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -871,9 +871,9 @@ const struct acpi_device *acpi_companion_match(const struct device *dev) * identifiers and a _DSD object with the "compatible" property, use that * property to match against the given list of identifiers. */ -bool acpi_of_match_device(const struct acpi_device *adev, - const struct of_device_id *of_match_table, - const struct of_device_id **of_id) +static bool acpi_of_match_device(const struct acpi_device *adev, + const struct of_device_id *of_match_table, + const struct of_device_id **of_id) { const union acpi_object *of_compatible, *obj; int i, nval; |