drm: of: Fix linking when CONFIG_OF is not set

Commit Message

Biju Das Aug. 11, 2020, 2:40 p.m. UTC

From: Laurent Pinchart <[e-mail]>

commit 528d06d41b80a4acb2a9efd33bfc87495147f75e upstream.

The new helper drm_of_lvds_get_dual_link_pixel_order() introduced in
commit 6529007522de has a fallback stub when CONFIG_OF is not set, but
the stub is declared in drm_of.h without a static inline. This causes
multiple definitions of the function to be linked when the CONFIG_OF
option isn't set. Fix it by making the stub static inline.

Fixes: 6529007522de ("drm: of: Add drm_of_lvds_get_dual_link_pixel_order")
Reported-by: kbuild test robot <[e-mail]>
Signed-off-by: Laurent Pinchart <[e-mail]>
Reviewed-by: Fabrizio Castro <[e-mail]>
Reviewed-by: Chris Wilson <[e-mail]>
Signed-off-by: Dave Airlie <[e-mail]>
Link: https://patchwork.freedesktop.org/patch/msgid/[e-mail]
Signed-off-by: Biju Das <[e-mail]>
Reported-by: kernel test robot <[e-mail]>
---
 include/drm/drm_of.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Pavel Machek Aug. 12, 2020, 7:24 p.m. UTC | #1

Hi!

I assume this patch is for 4.19-cip?

> commit 528d06d41b80a4acb2a9efd33bfc87495147f75e upstream.
> 
> The new helper drm_of_lvds_get_dual_link_pixel_order() introduced in
> commit 6529007522de has a fallback stub when CONFIG_OF is not set, but
> the stub is declared in drm_of.h without a static inline. This causes
> multiple definitions of the function to be linked when the CONFIG_OF
> option isn't set. Fix it by making the stub static inline.

So this is pretty obvious, and I'll likely apply it.

Best regards,
								Pavel
								

> diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h
> index 8ec7ca6d2369..b9b093add92e 100644
> --- a/include/drm/drm_of.h
> +++ b/include/drm/drm_of.h
> @@ -92,8 +92,9 @@ static inline int drm_of_find_panel_or_bridge(const struct device_node *np,
>  	return -EINVAL;
>  }
>  
> -int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1,
> -					  const struct device_node *port2)
> +static inline int
> +drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1,
> +				      const struct device_node *port2)
>  {
>  	return -EINVAL;
>  }

Biju Das Aug. 13, 2020, 6:39 a.m. UTC | #2

Hi Pavel,

Thanks for the feedback.

> Subject: Re: [PATCH] drm: of: Fix linking when CONFIG_OF is not set
>
> Hi!
>
> I assume this patch is for 4.19-cip?

Yes, it is for 4.19-cip.

> > commit 528d06d41b80a4acb2a9efd33bfc87495147f75e upstream.
> >
> > The new helper drm_of_lvds_get_dual_link_pixel_order() introduced in
> > commit 6529007522de has a fallback stub when CONFIG_OF is not set, but
> > the stub is declared in drm_of.h without a static inline. This causes
> > multiple definitions of the function to be linked when the CONFIG_OF
> > option isn't set. Fix it by making the stub static inline.
>
> So this is pretty obvious, and I'll likely apply it.

Thanks for applying it.

Regards,
Biju
>
> Best regards,
> Pavel
>
>
> > diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h index
> > 8ec7ca6d2369..b9b093add92e 100644
> > --- a/include/drm/drm_of.h
> > +++ b/include/drm/drm_of.h
> > @@ -92,8 +92,9 @@ static inline int drm_of_find_panel_or_bridge(const
> struct device_node *np,
> >  return -EINVAL;
> >  }
> >
> > -int drm_of_lvds_get_dual_link_pixel_order(const struct device_node
> *port1,
> > -  const struct device_node *port2)
> > +static inline int
> > +drm_of_lvds_get_dual_link_pixel_order(const struct device_node
> *port1,
> > +      const struct device_node *port2)
> >  {
> >  return -EINVAL;
> >  }
>
> --
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany


Renesas Electronics Europe GmbH, Geschaeftsfuehrer/President: Carsten Jauch, Sitz der Gesellschaft/Registered office: Duesseldorf, Arcadiastrasse 10, 40472 Duesseldorf, Germany, Handelsregister/Commercial Register: Duesseldorf, HRB 3708 USt-IDNr./Tax identification no.: DE 119353406 WEEE-Reg.-Nr./WEEE reg. no.: DE 14978647
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#5115): https://lists.cip-project.org/g/cip-dev/message/5115
Mute This Topic: https://lists.cip-project.org/mt/76127518/4520428
Group Owner: [e-mail]
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129116/1171672734/xyzzy  [[e-mail]]
-=-=-=-=-=-=-=-=-=-=-=-

Pavel Machek Aug. 13, 2020, 8:48 p.m. UTC | #3

On Thu 2020-08-13 06:39:55, Biju Das wrote:
> Hi Pavel,
> 
> Thanks for the feedback.
> 
> > Subject: Re: [PATCH] drm: of: Fix linking when CONFIG_OF is not set
> >
> > Hi!
> >
> > I assume this patch is for 4.19-cip?
> 
> Yes, it is for 4.19-cip.
> 
> > > commit 528d06d41b80a4acb2a9efd33bfc87495147f75e upstream.
> > >
> > > The new helper drm_of_lvds_get_dual_link_pixel_order() introduced in
> > > commit 6529007522de has a fallback stub when CONFIG_OF is not set, but
> > > the stub is declared in drm_of.h without a static inline. This causes
> > > multiple definitions of the function to be linked when the CONFIG_OF
> > > option isn't set. Fix it by making the stub static inline.
> >
> > So this is pretty obvious, and I'll likely apply it.
> 
> Thanks for applying it.

Applied.
								Pavel

Patch

diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h
index 8ec7ca6d2369..b9b093add92e 100644
--- a/include/drm/drm_of.h
+++ b/include/drm/drm_of.h
@@ -92,8 +92,9 @@  static inline int drm_of_find_panel_or_bridge(const struct device_node *np,
 	return -EINVAL;
 }
 
-int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1,
-					  const struct device_node *port2)
+static inline int
+drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1,
+				      const struct device_node *port2)
 {
 	return -EINVAL;
 }