This driver can use the replacement API instead of calling
of_match_device() and then dereferencing the pointer that is returned.
This nicely avoids referencing the match table when it is undefined with
configurations where CONFIG_OF=n.
Cc: Arnd Bergmann <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: Jacopo Mondi <[email protected]>
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Frank Rowand <[email protected]>
Cc: <[email protected]>
Cc: <[email protected]>
Signed-off-by: Stephen Boyd <[email protected]>
---
Please ack or pick for immediate merge so the last patch can be merged.
drivers/media/platform/renesas-ceu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/renesas-ceu.c b/drivers/media/platform/renesas-ceu.c
index 197b3991330d..60518bbc2cd5 100644
--- a/drivers/media/platform/renesas-ceu.c
+++ b/drivers/media/platform/renesas-ceu.c
@@ -1679,7 +1679,7 @@ static int ceu_probe(struct platform_device *pdev)
v4l2_async_notifier_init(&ceudev->notifier);
if (IS_ENABLED(CONFIG_OF) && dev->of_node) {
- ceu_data = of_match_device(ceu_of_match, dev)->data;
+ ceu_data = of_device_get_match_data(dev);
num_subdevs = ceu_parse_dt(ceudev);
} else if (dev->platform_data) {
/* Assume SH4 if booting with platform data. */
--
Sent by a computer through tubes
Em Fri, 4 Oct 2019 14:43:26 -0700
Stephen Boyd <[email protected]> escreveu:
> This driver can use the replacement API instead of calling
> of_match_device() and then dereferencing the pointer that is returned.
> This nicely avoids referencing the match table when it is undefined with
> configurations where CONFIG_OF=n.
>
> Cc: Arnd Bergmann <[email protected]>
> Cc: Geert Uytterhoeven <[email protected]>
> Cc: Jacopo Mondi <[email protected]>
> Cc: Mauro Carvalho Chehab <[email protected]>
> Cc: Rob Herring <[email protected]>
> Cc: Frank Rowand <[email protected]>
> Cc: <[email protected]>
> Cc: <[email protected]>
> Signed-off-by: Stephen Boyd <[email protected]>
> ---
>
> Please ack or pick for immediate merge so the last patch can be merged.
Feel free to merge it via your tree:
Acked-by: Mauro Carvalho Chehab <[email protected]>
>
> drivers/media/platform/renesas-ceu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/renesas-ceu.c b/drivers/media/platform/renesas-ceu.c
> index 197b3991330d..60518bbc2cd5 100644
> --- a/drivers/media/platform/renesas-ceu.c
> +++ b/drivers/media/platform/renesas-ceu.c
> @@ -1679,7 +1679,7 @@ static int ceu_probe(struct platform_device *pdev)
> v4l2_async_notifier_init(&ceudev->notifier);
>
> if (IS_ENABLED(CONFIG_OF) && dev->of_node) {
> - ceu_data = of_match_device(ceu_of_match, dev)->data;
> + ceu_data = of_device_get_match_data(dev);
> num_subdevs = ceu_parse_dt(ceudev);
> } else if (dev->platform_data) {
> /* Assume SH4 if booting with platform data. */
Thanks,
Mauro
Sorry,
totally missed it
On Wed, Oct 09, 2019 at 09:54:40AM -0300, Mauro Carvalho Chehab wrote:
> Em Fri, 4 Oct 2019 14:43:26 -0700
> Stephen Boyd <[email protected]> escreveu:
>
> > This driver can use the replacement API instead of calling
> > of_match_device() and then dereferencing the pointer that is returned.
> > This nicely avoids referencing the match table when it is undefined with
> > configurations where CONFIG_OF=n.
> >
> > Cc: Arnd Bergmann <[email protected]>
> > Cc: Geert Uytterhoeven <[email protected]>
> > Cc: Jacopo Mondi <[email protected]>
> > Cc: Mauro Carvalho Chehab <[email protected]>
> > Cc: Rob Herring <[email protected]>
> > Cc: Frank Rowand <[email protected]>
> > Cc: <[email protected]>
> > Cc: <[email protected]>
> > Signed-off-by: Stephen Boyd <[email protected]>
> > ---
> >
> > Please ack or pick for immediate merge so the last patch can be merged.
>
> Feel free to merge it via your tree:
>
> Acked-by: Mauro Carvalho Chehab <[email protected]>
>
The CEU driver does probably not need this as the dereferencing of the
pointer returned by of_match_device() is guarded by
IS_ENABLED(CONFIG_OF), but surely this does not hurt and it's nicer to
read.
With Mauro's ack mine is probably not needed, but:
Acked-by: Jacopo Mondi <[email protected]>
Thanks
j
>
> >
> > drivers/media/platform/renesas-ceu.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/media/platform/renesas-ceu.c b/drivers/media/platform/renesas-ceu.c
> > index 197b3991330d..60518bbc2cd5 100644
> > --- a/drivers/media/platform/renesas-ceu.c
> > +++ b/drivers/media/platform/renesas-ceu.c
> > @@ -1679,7 +1679,7 @@ static int ceu_probe(struct platform_device *pdev)
> > v4l2_async_notifier_init(&ceudev->notifier);
> >
> > if (IS_ENABLED(CONFIG_OF) && dev->of_node) {
> > - ceu_data = of_match_device(ceu_of_match, dev)->data;
> > + ceu_data = of_device_get_match_data(dev);
> > num_subdevs = ceu_parse_dt(ceudev);
> > } else if (dev->platform_data) {
> > /* Assume SH4 if booting with platform data. */
>
>
>
> Thanks,
> Mauro