lkml.org 
[lkml]   [2012]   [Jan]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the arm-soc tree with the arm tree
    Hi Shawn,

    On Sat, 7 Jan 2012 12:44:42 +0800 Shawn Guo <shawn.guo@linaro.org> wrote:
    >
    > On Fri, Jan 06, 2012 at 12:03:45PM +1100, Stephen Rothwell wrote:
    > > diff --cc arch/arm/mach-imx/mm-imx5.c
    > > index 65139a6,bc17dfe..0000000
    > > --- a/arch/arm/mach-imx/mm-imx5.c
    > > +++ b/arch/arm/mach-imx/mm-imx5.c
    > > @@@ -21,9 -22,27 +22,24 @@@
    > > #include <mach/devices-common.h>
    > > #include <mach/iomux-v3.h>
    > >
    > > + static struct clk *gpc_dvfs_clk;
    > > +
    > > static void imx5_idle(void)
    > > {
    > > - if (!need_resched()) {
    > > - /* gpc clock is needed for SRPG */
    > > - if (gpc_dvfs_clk == NULL) {
    > > - gpc_dvfs_clk = clk_get(NULL, "gpc_dvfs");
    > > - if (IS_ERR(gpc_dvfs_clk))
    > > - goto err0;
    > > - }
    > > - clk_enable(gpc_dvfs_clk);
    > > - mx5_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF);
    > > - if (tzic_enable_wake())
    > > - goto err1;
    > > - cpu_do_idle();
    > > -err1:
    > > - clk_disable(gpc_dvfs_clk);
    > > ++ /* gpc clock is needed for SRPG */
    > > ++ if (gpc_dvfs_clk == NULL) {
    > > ++ gpc_dvfs_clk = clk_get(NULL, "gpc_dvfs");
    > > ++ if (IS_ERR(gpc_dvfs_clk))
    > > ++ goto err0;
    > > + }
    > > ++ clk_enable(gpc_dvfs_clk);
    > > + mx5_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF);
    > > ++ if (tzic_enable_wake())
    > > ++ goto err1;
    > > ++ cpu_do_idle();
    > > ++err1:
    > > ++ clk_disable(gpc_dvfs_clk);
    > > + err0:
    > > - local_irq_enable();
    >
    > This results in a compile error.
    >
    > CC arch/arm/mach-imx/mm-imx5.o
    > arch/arm/mach-imx/mm-imx5.c: In function ‘imx5_idle’:
    > arch/arm/mach-imx/mm-imx5.c:42:1: error: label at end of compound statement

    Ooops. Sorry about that. Just remove the label and turn the "goto err0"
    into "return".

    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-01-07 07:57    [W:0.024 / U:0.132 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site