| Message ID | 1375857279-18082-1-git-send-email-k.kozlowski@samsung.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Aug 07, 2013 at 08:34:39AM +0200, Krzysztof Kozlowski wrote: >Fix compilation error in gpiomux (CONFIG_MSM_GPIOMUX=y): >arch/arm/mach-msm/gpiomux.c:24:13: error: static declaration of > ‘__msm_gpiomux_write’ follows non-static declaration >arch/arm/mach-msm/gpiomux.h:85:6: note: previous declaration of > ‘__msm_gpiomux_write’ was here > >Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Thanks, I'll pull this in. <https://patchwork.kernel.org/patch/2839921/> Daivd
On 08/07, David Brown wrote: > On Wed, Aug 07, 2013 at 08:34:39AM +0200, Krzysztof Kozlowski wrote: > >Fix compilation error in gpiomux (CONFIG_MSM_GPIOMUX=y): > >arch/arm/mach-msm/gpiomux.c:24:13: error: static declaration of > > ???__msm_gpiomux_write??? follows non-static declaration > >arch/arm/mach-msm/gpiomux.h:85:6: note: previous declaration of > > ???__msm_gpiomux_write??? was here > > > >Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> > > Thanks, I'll pull this in. > > <https://patchwork.kernel.org/patch/2839921/> > I believe this is fixed by Rohit's patch that has already been taken in a pull request? https://lkml.org/lkml/2013/7/26/608
On śro, 2013-08-07 at 14:08 -0700, Stephen Boyd wrote: > On 08/07, David Brown wrote: > > On Wed, Aug 07, 2013 at 08:34:39AM +0200, Krzysztof Kozlowski wrote: > > >Fix compilation error in gpiomux (CONFIG_MSM_GPIOMUX=y): > > >arch/arm/mach-msm/gpiomux.c:24:13: error: static declaration of > > > ???__msm_gpiomux_write??? follows non-static declaration > > >arch/arm/mach-msm/gpiomux.h:85:6: note: previous declaration of > > > ???__msm_gpiomux_write??? was here > > > > > >Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> > > > > Thanks, I'll pull this in. > > > > <https://patchwork.kernel.org/patch/2839921/> > > > > I believe this is fixed by Rohit's patch that has already been > taken in a pull request? > > https://lkml.org/lkml/2013/7/26/608 Yes, Rohit's patch fixes the problem so this is already in linux-msm tree. Best regards, Krzysztof
On 8/7/2013 11:32 PM, Krzysztof Kozlowski wrote: > On śro, 2013-08-07 at 14:08 -0700, Stephen Boyd wrote: >> On 08/07, David Brown wrote: >>> On Wed, Aug 07, 2013 at 08:34:39AM +0200, Krzysztof Kozlowski wrote: >>>> Fix compilation error in gpiomux (CONFIG_MSM_GPIOMUX=y): >>>> arch/arm/mach-msm/gpiomux.c:24:13: error: static declaration of >>>> ???__msm_gpiomux_write??? follows non-static declaration >>>> arch/arm/mach-msm/gpiomux.h:85:6: note: previous declaration of >>>> ???__msm_gpiomux_write??? was here >>>> >>>> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> >>> Thanks, I'll pull this in. >>> >>> <https://patchwork.kernel.org/patch/2839921/> >>> >> I believe this is fixed by Rohit's patch that has already been >> taken in a pull request? >> >> https://lkml.org/lkml/2013/7/26/608 > Yes, Rohit's patch fixes the problem so this is already in linux-msm > tree. > David, please can you confirm which pull request has this patch ? > Best regards, > Krzysztof > > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel Thanks, Rohit Vaswani
On Thu, Aug 08, 2013 at 03:17:25PM -0700, Rohit Vaswani wrote: >On 8/7/2013 11:32 PM, Krzysztof Kozlowski wrote: >> On śro, 2013-08-07 at 14:08 -0700, Stephen Boyd wrote: >>> On 08/07, David Brown wrote: >>>> On Wed, Aug 07, 2013 at 08:34:39AM +0200, Krzysztof Kozlowski wrote: >>>>> Fix compilation error in gpiomux (CONFIG_MSM_GPIOMUX=y): >>>>> arch/arm/mach-msm/gpiomux.c:24:13: error: static declaration of >>>>> ???__msm_gpiomux_write??? follows non-static declaration >>>>> arch/arm/mach-msm/gpiomux.h:85:6: note: previous declaration of >>>>> ???__msm_gpiomux_write??? was here >>>>> >>>>> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> >>>> Thanks, I'll pull this in. >>>> >>>> <https://patchwork.kernel.org/patch/2839921/> >>>> >>> I believe this is fixed by Rohit's patch that has already been >>> taken in a pull request? >>> >>> https://lkml.org/lkml/2013/7/26/608 >> Yes, Rohit's patch fixes the problem so this is already in linux-msm >> tree. > >David, please can you confirm which pull request has this patch ? It is in Linus' current tree. Olof pulled it into the ARM tree on Sunday, and Linus pulled those fixes yesterday morning. David
diff --git a/arch/arm/mach-msm/gpiomux.c b/arch/arm/mach-msm/gpiomux.c index 2b8e2d2..4110b82 100644 --- a/arch/arm/mach-msm/gpiomux.c +++ b/arch/arm/mach-msm/gpiomux.c @@ -21,7 +21,7 @@ static DEFINE_SPINLOCK(gpiomux_lock); -static void __msm_gpiomux_write(unsigned gpio, gpiomux_config_t val) +void __msm_gpiomux_write(unsigned gpio, gpiomux_config_t val) { unsigned tlmm_config = (val & ~GPIOMUX_CTL_MASK) | ((gpio & 0x3ff) << 4);
Fix compilation error in gpiomux (CONFIG_MSM_GPIOMUX=y): arch/arm/mach-msm/gpiomux.c:24:13: error: static declaration of ‘__msm_gpiomux_write’ follows non-static declaration arch/arm/mach-msm/gpiomux.h:85:6: note: previous declaration of ‘__msm_gpiomux_write’ was here Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> --- arch/arm/mach-msm/gpiomux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)