The following commit has been merged into the efi/core branch of tip: Commit-ID: 55fc610c8cdae353737dbc2d59febd3c1a697095 Gitweb: https://git.kernel.org/tip/55fc610c8cdae353737dbc2d59febd3c1a697095 Author: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx> AuthorDate: Thu, 04 Mar 2021 11:28:37 +03:00 Committer: Ard Biesheuvel <ardb@xxxxxxxxxx> CommitterDate: Sat, 22 May 2021 14:06:59 +02:00 efi/apple-properties: Handle device properties with software node API The old device property API is going to be removed. Replacing the device_add_properties() call with the software node API equivalent, device_create_managed_software_node(). Signed-off-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx> Acked-by: Lukas Wunner <lukas@xxxxxxxxx> Signed-off-by: Ard Biesheuvel <ardb@xxxxxxxxxx> --- drivers/firmware/efi/apple-properties.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/efi/apple-properties.c b/drivers/firmware/efi/apple-properties.c index e192648..4c3201e 100644 --- a/drivers/firmware/efi/apple-properties.c +++ b/drivers/firmware/efi/apple-properties.c @@ -157,7 +157,7 @@ static int __init unmarshal_devices(struct properties_header *properties) if (!entry[0].name) goto skip_device; - ret = device_add_properties(dev, entry); /* makes deep copy */ + ret = device_create_managed_software_node(dev, entry, NULL); if (ret) dev_err(dev, "error %d assigning properties\n", ret);
|