diff for duplicates of <20110119230939.GL4957@atomide.com> diff --git a/a/1.txt b/N1/1.txt index affd26d..5dad476 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,28 +12,28 @@ > > > > > > Signed-off-by: Felipe Balbi <balbi@ti.com> > > > --- -> > > arch/arm/mach-omap2/clkt_clksel.c | 5 ++++- -> > > 1 files changed, 4 insertions(+), 1 deletions(-) +> > > ?arch/arm/mach-omap2/clkt_clksel.c | ? ?5 ++++- +> > > ?1 files changed, 4 insertions(+), 1 deletions(-) > > > > > > diff --git a/arch/arm/mach-omap2/clkt_clksel.c b/arch/arm/mach-omap2/clkt_clksel.c > > > index a781cd6..baf0b6b 100644 > > > --- a/arch/arm/mach-omap2/clkt_clksel.c > > > +++ b/arch/arm/mach-omap2/clkt_clksel.c > > > @@ -97,7 +97,7 @@ static u8 _get_div_and_fieldval(struct clk *src_clk, struct clk *clk, -> > > u32 *field_val) -> > > { -> > > const struct clksel *clks; -> > > - const struct clksel_rate *clkr, *max_clkr; -> > > + const struct clksel_rate *clkr, *max_clkr = NULL; -> > > u8 max_div = 0; +> > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?u32 *field_val) +> > > ?{ +> > > ? ? ? ?const struct clksel *clks; +> > > - ? ? ? const struct clksel_rate *clkr, *max_clkr; +> > > + ? ? ? const struct clksel_rate *clkr, *max_clkr = NULL; +> > > ? ? ? ?u8 max_div = 0; > > > -> > > clks = _get_clksel_by_parent(clk, src_clk); +> > > ? ? ? ?clks = _get_clksel_by_parent(clk, src_clk); > > > @@ -123,6 +123,9 @@ static u8 _get_div_and_fieldval(struct clk *src_clk, struct clk *clk, -> > > } -> > > } +> > > ? ? ? ? ? ? ? ?} +> > > ? ? ? ?} > > > -> > > + if (!max_clkr) -> > > + return 0; +> > > + ? ? ? if (!max_clkr) +> > > + ? ? ? ? ? ? ? return 0; > > > > Would it be more appropriate to move this check after the "if" check > > of max_div==0 and it's warning? @@ -47,7 +47,3 @@ Looks like the max_div test should catch it to me. Paul? Tony --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 7b8b764..cc22bec 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,15 +2,10 @@ "ref\01295238680-26738-8-git-send-email-balbi@ti.com\0" "ref\0AANLkTimO_Vt+bjS1rP1AwD9iSqd_cNLAZ+tukveOtneD@mail.gmail.com\0" "ref\020110117081845.GF2812@legolas.emea.dhcp.ti.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 7/7] arm: omap2: clksel: fix compile warning\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 7/7] arm: omap2: clksel: fix compile warning\0" "Date\0Wed, 19 Jan 2011 15:09:39 -0800\0" - "To\0Felipe Balbi <balbi@ti.com>\0" - "Cc\0Varadarajan" - Charulatha <charu@ti.com> - Linux ARM Kernel Mailing List <linux-arm-kernel@lists.infradead.org> - Linux OMAP Mailing List <linux-omap@vger.kernel.org> - " Paul Walmsley <paul@pwsan.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Felipe Balbi <balbi@ti.com> [110117 00:18]:\n" @@ -27,28 +22,28 @@ "> > >\n" "> > > Signed-off-by: Felipe Balbi <balbi@ti.com>\n" "> > > ---\n" - "> > > \302\240arch/arm/mach-omap2/clkt_clksel.c | \302\240 \302\2405 ++++-\n" - "> > > \302\2401 files changed, 4 insertions(+), 1 deletions(-)\n" + "> > > ?arch/arm/mach-omap2/clkt_clksel.c | ? ?5 ++++-\n" + "> > > ?1 files changed, 4 insertions(+), 1 deletions(-)\n" "> > >\n" "> > > diff --git a/arch/arm/mach-omap2/clkt_clksel.c b/arch/arm/mach-omap2/clkt_clksel.c\n" "> > > index a781cd6..baf0b6b 100644\n" "> > > --- a/arch/arm/mach-omap2/clkt_clksel.c\n" "> > > +++ b/arch/arm/mach-omap2/clkt_clksel.c\n" "> > > @@ -97,7 +97,7 @@ static u8 _get_div_and_fieldval(struct clk *src_clk, struct clk *clk,\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240u32 *field_val)\n" - "> > > \302\240{\n" - "> > > \302\240 \302\240 \302\240 \302\240const struct clksel *clks;\n" - "> > > - \302\240 \302\240 \302\240 const struct clksel_rate *clkr, *max_clkr;\n" - "> > > + \302\240 \302\240 \302\240 const struct clksel_rate *clkr, *max_clkr = NULL;\n" - "> > > \302\240 \302\240 \302\240 \302\240u8 max_div = 0;\n" + "> > > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?u32 *field_val)\n" + "> > > ?{\n" + "> > > ? ? ? ?const struct clksel *clks;\n" + "> > > - ? ? ? const struct clksel_rate *clkr, *max_clkr;\n" + "> > > + ? ? ? const struct clksel_rate *clkr, *max_clkr = NULL;\n" + "> > > ? ? ? ?u8 max_div = 0;\n" "> > >\n" - "> > > \302\240 \302\240 \302\240 \302\240clks = _get_clksel_by_parent(clk, src_clk);\n" + "> > > ? ? ? ?clks = _get_clksel_by_parent(clk, src_clk);\n" "> > > @@ -123,6 +123,9 @@ static u8 _get_div_and_fieldval(struct clk *src_clk, struct clk *clk,\n" - "> > > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240}\n" - "> > > \302\240 \302\240 \302\240 \302\240}\n" + "> > > ? ? ? ? ? ? ? ?}\n" + "> > > ? ? ? ?}\n" "> > >\n" - "> > > + \302\240 \302\240 \302\240 if (!max_clkr)\n" - "> > > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 return 0;\n" + "> > > + ? ? ? if (!max_clkr)\n" + "> > > + ? ? ? ? ? ? ? return 0;\n" "> > \n" "> > Would it be more appropriate to move this check after the \"if\" check\n" "> > of max_div==0 and it's warning?\n" @@ -61,10 +56,6 @@ "\n" "Looks like the max_div test should catch it to me. Paul?\n" "\n" - "Tony\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-omap\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + Tony -78c9f496dedfd06e1b2ee2e60cbf401e59305535df8a7637053d4d5372c3fbd4 +044f0e6908220623f21672dd6291214e1339858fc81ac998efff96ead30a7e2a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.