2020-07-21 10:25:16

by Alexandru Ardelean

Subject: [PATCH] iio: core: fix/re-introduce back parent assignment

This was introduced initially via commit 78289b4a58b58 ("iio: core: pass
parent device as parameter during allocation"), but was accidentally
removed via commit 6d4ebd565d15f ("iio: core: wrap IIO device into an
iio_dev_opaque object").

This looks like a rebase gone wrong, and ends up breaking devicetree
bindings of IIO clients.

This change adds back the parent assignment.

Fixes 6d4ebd565d15f: ("iio: core: wrap IIO device into an iio_dev_opaque object")
Reported-by: Dmitry Baryshkov <[email protected]>
Signed-off-by: Alexandru Ardelean <[email protected]>
---
drivers/iio/industrialio-core.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 30fc96952681..59003dc44e60 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -1546,6 +1546,7 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv)
dev->priv = (char *)iio_dev_opaque +
ALIGN(sizeof(struct iio_dev_opaque), IIO_ALIGN);

+ dev->dev.parent = parent;
dev->dev.groups = dev->groups;
dev->dev.type = &iio_device_type;
dev->dev.bus = &iio_bus_type;
--
2.25.1

2020-07-21 10:37:09

by Dmitry Baryshkov

Subject: Re: [PATCH] iio: core: fix/re-introduce back parent assignment

вт, 21 июл. 2020 г. в 13:24, Alexandru Ardelean <[email protected]>:
>
> This was introduced initially via commit 78289b4a58b58 ("iio: core: pass
> parent device as parameter during allocation"), but was accidentally
> removed via commit 6d4ebd565d15f ("iio: core: wrap IIO device into an
> iio_dev_opaque object").
>
> This looks like a rebase gone wrong, and ends up breaking devicetree
> bindings of IIO clients.
>
> This change adds back the parent assignment.
>
> Fixes 6d4ebd565d15f: ("iio: core: wrap IIO device into an iio_dev_opaque object")
> Reported-by: Dmitry Baryshkov <[email protected]>
> Signed-off-by: Alexandru Ardelean <[email protected]>

Tested-by: Dmitry Baryshkov <[email protected]>

--
With best wishes
Dmitry

2020-07-21 12:22:26

by Jonathan Cameron

Subject: Re: [PATCH] iio: core: fix/re-introduce back parent assignment

On Tue, 21 Jul 2020 13:34:19 +0300
Dmitry Baryshkov <[email protected]> wrote:

> вт, 21 июл. 2020 г. в 13:24, Alexandru Ardelean <[email protected]>:
> [...]
>
> Tested-by: Dmitry Baryshkov <[email protected]>
>
Applied to the togreg branch of iio.git and pushed out as testing.
Current plan is to do a pull request tomorrow so should make it in time
for the merge window. If it gets delayed for some reason we can send
it as a fix after the merge window.

Thanks,

Jonathan