| Message ID | 1454509515-2365-1-git-send-email-luis.henriques@canonical.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/03/2016 07:55 PM, Luis Henriques wrote: > This fixes the following build failure: > > drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.o: In function `msm_dsi_pll_28nm_8960_init': > dsi_pll_28nm.c:(.text+0x1198): multiple definition of `msm_dsi_pll_28nm_8960_init' > drivers/gpu/drm/msm/dsi/pll/dsi_pll.o:dsi_pll.c:(.text+0x0): first defined here Thanks for the fix. Acked-by: Archit Taneja <architt@codeaurora.org> Dave, Could you please queue this for the next -rc cycle since it causes a build break? Thanks, Archit > > Signed-off-by: Luis Henriques <luis.henriques@canonical.com> > --- > drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h > index 80b6038334a6..2cf1664723e8 100644 > --- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h > +++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h > @@ -97,8 +97,8 @@ static inline struct msm_dsi_pll *msm_dsi_pll_28nm_init( > struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device *pdev, > int id); > #else > -struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device *pdev, > - int id) > +static inline struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init( > + struct platform_device *pdev, int id) > { > return ERR_PTR(-ENODEV); > } >
On 04/02/16 05:09, Archit Taneja wrote: > > > On 02/03/2016 07:55 PM, Luis Henriques wrote: >> This fixes the following build failure: >> >> drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.o: In function >> `msm_dsi_pll_28nm_8960_init': >> dsi_pll_28nm.c:(.text+0x1198): multiple definition of >> `msm_dsi_pll_28nm_8960_init' >> drivers/gpu/drm/msm/dsi/pll/dsi_pll.o:dsi_pll.c:(.text+0x0): first >> defined here > > Thanks for the fix. > > Acked-by: Archit Taneja <architt@codeaurora.org> > > Dave, > > Could you please queue this for the next -rc cycle since it causes a > build break? > I've just hit this build break on v4.5-rc7 ... was there any progress getting this fix in ? I can't see any further reference to this thread on LKML. Just to note, changing to a static generates a build-warning for me: CC drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.o In file included from sources/linux/drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c:17:0: sources/linux/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h:100:28: warning: ‘msm_dsi_pll_28nm_8960_init’ defined but not used [-Wunused-function] static struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device *pdev, ^ -- Kieran > Thanks, > Archit > >> >> Signed-off-by: Luis Henriques <luis.henriques@canonical.com> >> --- >> drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h >> b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h >> index 80b6038334a6..2cf1664723e8 100644 >> --- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h >> +++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h >> @@ -97,8 +97,8 @@ static inline struct msm_dsi_pll >> *msm_dsi_pll_28nm_init( >> struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct >> platform_device *pdev, >> int id); >> #else >> -struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device >> *pdev, >> - int id) >> +static inline struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init( >> + struct platform_device *pdev, int id) >> { >> return ERR_PTR(-ENODEV); >> } >> >
On Sun, Mar 13, 2016 at 5:12 PM, Kieran Bingham <kieran.bingham@linaro.org> wrote: > On 04/02/16 05:09, Archit Taneja wrote: >> >> >> On 02/03/2016 07:55 PM, Luis Henriques wrote: >>> This fixes the following build failure: >>> >>> drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.o: In function >>> `msm_dsi_pll_28nm_8960_init': >>> dsi_pll_28nm.c:(.text+0x1198): multiple definition of >>> `msm_dsi_pll_28nm_8960_init' >>> drivers/gpu/drm/msm/dsi/pll/dsi_pll.o:dsi_pll.c:(.text+0x0): first >>> defined here >> >> Thanks for the fix. >> >> Acked-by: Archit Taneja <architt@codeaurora.org> >> >> Dave, >> >> Could you please queue this for the next -rc cycle since it causes a >> build break? >> > > I've just hit this build break on v4.5-rc7 ... was there any progress > getting this fix in ? I can't see any further reference to this thread > on LKML. > > Just to note, changing to a static generates a build-warning for me: > > CC drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.o > In file included from > sources/linux/drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c:17:0: > sources/linux/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h:100:28: warning: > ‘msm_dsi_pll_28nm_8960_init’ defined but not used [-Wunused-function] > static struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct > platform_device *pdev, > ^ oh, the patch to change it to static inline was in my pull req for 4.6, but perhaps this should have been sent as a -fixes pull for 4.5? Dave, if you are sending another -fixes pull for 4.5 could you include this? Not sure about the warning (I don't see that, but I have static-inline vs static) BR, -R > -- > Kieran > >> Thanks, >> Archit >> >>> >>> Signed-off-by: Luis Henriques <luis.henriques@canonical.com> >>> --- >>> drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h >>> b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h >>> index 80b6038334a6..2cf1664723e8 100644 >>> --- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h >>> +++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h >>> @@ -97,8 +97,8 @@ static inline struct msm_dsi_pll >>> *msm_dsi_pll_28nm_init( >>> struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct >>> platform_device *pdev, >>> int id); >>> #else >>> -struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device >>> *pdev, >>> - int id) >>> +static inline struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init( >>> + struct platform_device *pdev, int id) >>> { >>> return ERR_PTR(-ENODEV); >>> } >>> >> >
On 14/03/16 01:07, Rob Clark wrote: > On Sun, Mar 13, 2016 at 5:12 PM, Kieran Bingham > <kieran.bingham@linaro.org> wrote: >> On 04/02/16 05:09, Archit Taneja wrote: >>> >>> >>> On 02/03/2016 07:55 PM, Luis Henriques wrote: >>>> This fixes the following build failure: >>>> >>>> drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.o: In function >>>> `msm_dsi_pll_28nm_8960_init': >>>> dsi_pll_28nm.c:(.text+0x1198): multiple definition of >>>> `msm_dsi_pll_28nm_8960_init' >>>> drivers/gpu/drm/msm/dsi/pll/dsi_pll.o:dsi_pll.c:(.text+0x0): first >>>> defined here >>> >>> Thanks for the fix. >>> >>> Acked-by: Archit Taneja <architt@codeaurora.org> >>> >>> Dave, >>> >>> Could you please queue this for the next -rc cycle since it causes a >>> build break? >>> >> >> I've just hit this build break on v4.5-rc7 ... was there any progress >> getting this fix in ? I can't see any further reference to this thread >> on LKML. >> >> Just to note, changing to a static generates a build-warning for me: >> >> CC drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.o >> In file included from >> sources/linux/drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c:17:0: >> sources/linux/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h:100:28: warning: >> ‘msm_dsi_pll_28nm_8960_init’ defined but not used [-Wunused-function] >> static struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct >> platform_device *pdev, >> ^ > > oh, the patch to change it to static inline was in my pull req for > 4.6, but perhaps this should have been sent as a -fixes pull for 4.5? > Dave, if you are sending another -fixes pull for 4.5 could you include > this? I see a shiny new v4.5 tag this morning, so I guess we don't need to worry about getting in there. Is it worth sending to -stable? > Not sure about the warning (I don't see that, but I have static-inline > vs static) Ah yes of course ... Just double checked here, and I had dropped the inline in my sleep deprived state. So no worries about the warning. Regards Kieran > > BR, > -R > > >> -- >> Kieran >> >>> Thanks, >>> Archit >>> >>>> >>>> Signed-off-by: Luis Henriques <luis.henriques@canonical.com> >>>> --- >>>> drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 4 ++-- >>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h >>>> b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h >>>> index 80b6038334a6..2cf1664723e8 100644 >>>> --- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h >>>> +++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h >>>> @@ -97,8 +97,8 @@ static inline struct msm_dsi_pll >>>> *msm_dsi_pll_28nm_init( >>>> struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct >>>> platform_device *pdev, >>>> int id); >>>> #else >>>> -struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device >>>> *pdev, >>>> - int id) >>>> +static inline struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init( >>>> + struct platform_device *pdev, int id) >>>> { >>>> return ERR_PTR(-ENODEV); >>>> } >>>> >>> >>
On Mon, Mar 14, 2016 at 3:59 AM, Kieran Bingham <kieran.bingham@linaro.org> wrote: > On 14/03/16 01:07, Rob Clark wrote: >> On Sun, Mar 13, 2016 at 5:12 PM, Kieran Bingham >> <kieran.bingham@linaro.org> wrote: >>> On 04/02/16 05:09, Archit Taneja wrote: >>>> >>>> >>>> On 02/03/2016 07:55 PM, Luis Henriques wrote: >>>>> This fixes the following build failure: >>>>> >>>>> drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.o: In function >>>>> `msm_dsi_pll_28nm_8960_init': >>>>> dsi_pll_28nm.c:(.text+0x1198): multiple definition of >>>>> `msm_dsi_pll_28nm_8960_init' >>>>> drivers/gpu/drm/msm/dsi/pll/dsi_pll.o:dsi_pll.c:(.text+0x0): first >>>>> defined here >>>> >>>> Thanks for the fix. >>>> >>>> Acked-by: Archit Taneja <architt@codeaurora.org> >>>> >>>> Dave, >>>> >>>> Could you please queue this for the next -rc cycle since it causes a >>>> build break? >>>> >>> >>> I've just hit this build break on v4.5-rc7 ... was there any progress >>> getting this fix in ? I can't see any further reference to this thread >>> on LKML. >>> >>> Just to note, changing to a static generates a build-warning for me: >>> >>> CC drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.o >>> In file included from >>> sources/linux/drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c:17:0: >>> sources/linux/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h:100:28: warning: >>> ‘msm_dsi_pll_28nm_8960_init’ defined but not used [-Wunused-function] >>> static struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct >>> platform_device *pdev, >>> ^ >> >> oh, the patch to change it to static inline was in my pull req for >> 4.6, but perhaps this should have been sent as a -fixes pull for 4.5? >> Dave, if you are sending another -fixes pull for 4.5 could you include >> this? > > I see a shiny new v4.5 tag this morning, so I guess we don't need to > worry about getting in there. Is it worth sending to -stable? > yeah, I think -stable material BR, -R
diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h index 80b6038334a6..2cf1664723e8 100644 --- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h +++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h @@ -97,8 +97,8 @@ static inline struct msm_dsi_pll *msm_dsi_pll_28nm_init( struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device *pdev, int id); #else -struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device *pdev, - int id) +static inline struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init( + struct platform_device *pdev, int id) { return ERR_PTR(-ENODEV); }
This fixes the following build failure: drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.o: In function `msm_dsi_pll_28nm_8960_init': dsi_pll_28nm.c:(.text+0x1198): multiple definition of `msm_dsi_pll_28nm_8960_init' drivers/gpu/drm/msm/dsi/pll/dsi_pll.o:dsi_pll.c:(.text+0x0): first defined here Signed-off-by: Luis Henriques <luis.henriques@canonical.com> --- drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)