[4.2.y-ckt stable] Patch "clk: meson: Fix meson_clk_register_clks() signature type mismatch" has been added to the 4.2.y-ckt tree

[Kamal Mostafa]

On Thu, Mar 31, 2016 at 11:48:41AM +0200, Andreas Färber wrote:
> Hi Kamal,
> 
> Am 31.03.2016 um 01:54 schrieb Kamal Mostafa:
> > This is a note to let you know that I have just added a patch titled
> > 
> >     clk: meson: Fix meson_clk_register_clks() signature type mismatch
> > 
> > to the linux-4.2.y-queue branch of the 4.2.y-ckt extended stable tree 
> > which can be found at:
> > 
> >     http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-4.2.y-queue
> > 
> > This patch is scheduled to be released in version 4.2.8-ckt7.
> > 
> > If you, or anyone else, feels it should not be added to this tree, please 
> > reply to this email.
> 
> Since arm64 meson support is only in 4.6+ this patch is not strictly
> needed here. It shouldn't cause damage though.
> 
> Regards,
> Andreas
> 

Hi Andreas-

I pulled it into 4.2-stable due to:

  Fixes: 7a29a869434e ("clk: meson: Add support for Meson clock controller")

Since the patch is clearly a good fix, I'm inclined to just leave it in.
Thanks very much for your review!

 -Kamal

> > 
> > For more information about the 4.2.y-ckt tree, see
> > https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
> > 
> > Thanks.
> > -Kamal
> > 
> > ---8<------------------------------------------------------------
> > 
> > From 668db269f238cf4a3313cab49ab8474a01e596b9 Mon Sep 17 00:00:00 2001
> > From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber at suse.de>
> > Date: Sun, 7 Feb 2016 22:13:03 +0100
> > Subject: clk: meson: Fix meson_clk_register_clks() signature type mismatch
> > MIME-Version: 1.0
> > Content-Type: text/plain; charset=UTF-8
> > Content-Transfer-Encoding: 8bit
> > 
> > commit bb473593c8099302bfd7befc23de67df907e3a99 upstream.
> > 
> > As preparation for arm64 based mesongxbb, which pulls in this code once
> > enabling ARCH_MESON, fix a size_t vs. unsigned int type mismatch.
> > The loop uses a local unsigned int variable, so adopt that type,
> > matching the header.
> > 
> > Fixes: 7a29a869434e ("clk: meson: Add support for Meson clock controller")
> > Signed-off-by: Andreas Färber <afaerber at suse.de>
> > Acked-by: Carlo Caione <carlo at endlessm.com>
> > Signed-off-by: Stephen Boyd <sboyd at codeaurora.org>
> > Signed-off-by: Kamal Mostafa <kamal at canonical.com>
> > ---
> >  drivers/clk/meson/clkc.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/clk/meson/clkc.c b/drivers/clk/meson/clkc.c
> > index b8c511c..a19190f 100644
> > --- a/drivers/clk/meson/clkc.c
> > +++ b/drivers/clk/meson/clkc.c
> > @@ -199,7 +199,7 @@ meson_clk_register_fixed_rate(const struct clk_conf *clk_conf,
> >  }
> > 
> >  void __init meson_clk_register_clks(const struct clk_conf *clk_confs,
> > -				    size_t nr_confs,
> > +				    unsigned int nr_confs,
> >  				    void __iomem *clk_base)
> >  {
> >  	unsigned int i;
> > --
> > 2.7.4
> > 
> 
> 
> -- 
> SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)