2021-03-04 15:36:46

by Heikki Krogerus

Subject: [PATCH] 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 <[email protected]>
---
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 e1926483ae2fd..4c3201e290e29 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);

--
2.30.1

2021-03-05 00:07:06

by Ard Biesheuvel

Subject: Re: [PATCH] efi/apple-properties: Handle device properties with software node API

(+ Lukas)

On Thu, 4 Mar 2021 at 09:28, Heikki Krogerus
<[email protected]> wrote:
>
> 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 <[email protected]>
> ---
> 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 e1926483ae2fd..4c3201e290e29 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);
>
> --
> 2.30.1
>

2021-03-05 00:09:02

by Lukas Wunner

Subject: Re: [PATCH] efi/apple-properties: Handle device properties with software node API

On Thu, Mar 04, 2021 at 11:28:37AM +0300, Heikki Krogerus wrote:
> 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 <[email protected]>

Acked-by: Lukas Wunner <[email protected]>

2021-03-08 05:47:09

by Ard Biesheuvel

Subject: Re: [PATCH] efi/apple-properties: Handle device properties with software node API

On Thu, 4 Mar 2021 at 10:46, Lukas Wunner <[email protected]> wrote:
>
> On Thu, Mar 04, 2021 at 11:28:37AM +0300, Heikki Krogerus wrote:
> > 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 <[email protected]>
>
> Acked-by: Lukas Wunner <[email protected]>

Queued in efi/next

Thanks all.