2020-03-04 11:37:32

by Yue Haibing

Subject: [PATCH -next] iio: ping: set pa_laser_ping_cfg in of_ping_match

pa_laser_ping_cfg should be set in of_ping_match
instead of pa_ping_cfg.

Fixes: 7bb501f49ddb ("iio: ping: add parallax ping sensors")
Signed-off-by: YueHaibing <[email protected]>
---
drivers/iio/proximity/ping.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iio/proximity/ping.c b/drivers/iio/proximity/ping.c
index 34aff10..12b893c 100644
--- a/drivers/iio/proximity/ping.c
+++ b/drivers/iio/proximity/ping.c
@@ -269,7 +269,7 @@ static const struct iio_chan_spec ping_chan_spec[] = {

static const struct of_device_id of_ping_match[] = {
{ .compatible = "parallax,ping", .data = &pa_ping_cfg},
- { .compatible = "parallax,laserping", .data = &pa_ping_cfg},
+ { .compatible = "parallax,laserping", .data = &pa_laser_ping_cfg},
{},
};

--
2.7.4

2020-03-04 11:56:50

by Andreas Klinger

Subject: Re: [PATCH -next] iio: ping: set pa_laser_ping_cfg in of_ping_match

Acked-by: Andreas Klinger <[email protected]>

YueHaibing <[email protected]> schrieb am Mi, 04. Mär 19:34:
> pa_laser_ping_cfg should be set in of_ping_match
> instead of pa_ping_cfg.
>
> Fixes: 7bb501f49ddb ("iio: ping: add parallax ping sensors")
> Signed-off-by: YueHaibing <[email protected]>
> ---
> drivers/iio/proximity/ping.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iio/proximity/ping.c b/drivers/iio/proximity/ping.c
> index 34aff10..12b893c 100644
> --- a/drivers/iio/proximity/ping.c
> +++ b/drivers/iio/proximity/ping.c
> @@ -269,7 +269,7 @@ static const struct iio_chan_spec ping_chan_spec[] = {
>
> static const struct of_device_id of_ping_match[] = {
> { .compatible = "parallax,ping", .data = &pa_ping_cfg},
> - { .compatible = "parallax,laserping", .data = &pa_ping_cfg},
> + { .compatible = "parallax,laserping", .data = &pa_laser_ping_cfg},
> {},
> };
>
> --
> 2.7.4
>
>

2020-03-07 15:30:48

by Jonathan Cameron

Subject: Re: [PATCH -next] iio: ping: set pa_laser_ping_cfg in of_ping_match

On Wed, 4 Mar 2020 12:55:46 +0100
Andreas Klinger <[email protected]> wrote:

> Acked-by: Andreas Klinger <[email protected]>
Applied to the fixes-togreg branch of iio.git.

Btw this is also in mainline I believe, so the -next is probably an
inappropriate marking.

Thanks,

Jonathan

>
> YueHaibing <[email protected]> schrieb am Mi, 04. Mär 19:34:
> > pa_laser_ping_cfg should be set in of_ping_match
> > instead of pa_ping_cfg.
> >
> > Fixes: 7bb501f49ddb ("iio: ping: add parallax ping sensors")
> > Signed-off-by: YueHaibing <[email protected]>
> > ---
> > drivers/iio/proximity/ping.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/iio/proximity/ping.c b/drivers/iio/proximity/ping.c
> > index 34aff10..12b893c 100644
> > --- a/drivers/iio/proximity/ping.c
> > +++ b/drivers/iio/proximity/ping.c
> > @@ -269,7 +269,7 @@ static const struct iio_chan_spec ping_chan_spec[] = {
> >
> > static const struct of_device_id of_ping_match[] = {
> > { .compatible = "parallax,ping", .data = &pa_ping_cfg},
> > - { .compatible = "parallax,laserping", .data = &pa_ping_cfg},
> > + { .compatible = "parallax,laserping", .data = &pa_laser_ping_cfg},
> > {},
> > };
> >
> > --
> > 2.7.4
> >
> >

2020-03-10 13:45:03

by Yue Haibing

Subject: Re: [PATCH -next] iio: ping: set pa_laser_ping_cfg in of_ping_match

On 2020/3/7 23:30, Jonathan Cameron wrote:
> On Wed, 4 Mar 2020 12:55:46 +0100
> Andreas Klinger <[email protected]> wrote:
>
>> Acked-by: Andreas Klinger <[email protected]>
> Applied to the fixes-togreg branch of iio.git.
>
> Btw this is also in mainline I believe, so the -next is probably an
> inappropriate marking.

Got it, will notice this next time, thanks!

>
> Thanks,
>
> Jonathan
>
>>
>> YueHaibing <[email protected]> schrieb am Mi, 04. Mär 19:34:
>>> pa_laser_ping_cfg should be set in of_ping_match
>>> instead of pa_ping_cfg.
>>>
>>> Fixes: 7bb501f49ddb ("iio: ping: add parallax ping sensors")
>>> Signed-off-by: YueHaibing <[email protected]>
>>> ---
>>> drivers/iio/proximity/ping.c | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/iio/proximity/ping.c b/drivers/iio/proximity/ping.c
>>> index 34aff10..12b893c 100644
>>> --- a/drivers/iio/proximity/ping.c
>>> +++ b/drivers/iio/proximity/ping.c
>>> @@ -269,7 +269,7 @@ static const struct iio_chan_spec ping_chan_spec[] = {
>>>
>>> static const struct of_device_id of_ping_match[] = {
>>> { .compatible = "parallax,ping", .data = &pa_ping_cfg},
>>> - { .compatible = "parallax,laserping", .data = &pa_ping_cfg},
>>> + { .compatible = "parallax,laserping", .data = &pa_laser_ping_cfg},
>>> {},
>>> };
>>>
>>> --
>>> 2.7.4
>>>
>>>
>
>
> .
>