From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kieran Bingham Subject: Re: [PATCH] drm/msm/dsi: fix definition of msm_dsi_pll_28nm_8960_init() Date: Mon, 14 Mar 2016 07:59:43 +0000 Message-ID: <56E66F6F.5090204@linaro.org> References: <1454509515-2365-1-git-send-email-luis.henriques@canonical.com> <56B2DD05.1070405@codeaurora.org> <56E5D7CD.7070204@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Rob Clark Cc: Archit Taneja , Luis Henriques , David Airlie , Linux Kernel , "dri-devel@lists.freedesktop.org" List-Id: dri-devel@lists.freedesktop.org On 14/03/16 01:07, Rob Clark wrote: > On Sun, Mar 13, 2016 at 5:12 PM, Kieran Bingham > 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 >>> >>> 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 progres= s >> getting this fix in ? I can't see any further reference to this thre= ad >> 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: >> =E2=80=98msm_dsi_pll_28nm_8960_init=E2=80=99 defined but not used [-= Wunused-function] >> static struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct >> platform_device *pdev, >> ^ >=20 > 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 includ= e > 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-inlin= e > 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 >=20 > BR, > -R >=20 >=20 >> -- >> Kieran >> >>> Thanks, >>> Archit >>> >>>> >>>> Signed-off-by: Luis Henriques >>>> --- >>>> 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_de= vice >>>> *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); >>>> } >>>> >>> >>