| Message ID | 1383000569-8916-3-git-send-email-laurent.pinchart+renesas@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Oct 28, 2013 at 11:49:19PM +0100, Laurent Pinchart wrote: > Prepare the clock at probe time, as there is no other appropriate place > in the driver where we're allowed to sleep. > > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > drivers/clocksource/sh_mtu2.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) Thanks Laurent, I have queued this up in the clocksources branch of my renesas tree. I will send a pull request to Mike once v3.13-rc1 has hit the shelves. Mike, please let me know if you would prefer something earlier than that.
Hello. On 29-10-2013 2:49, Laurent Pinchart wrote: > Prepare the clock at probe time, as there is no other appropriate place > in the driver where we're allowed to sleep. > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > drivers/clocksource/sh_mtu2.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c > index 4aac9ee..3cf1283 100644 > --- a/drivers/clocksource/sh_mtu2.c > +++ b/drivers/clocksource/sh_mtu2.c > @@ -313,8 +313,20 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev) > goto err1; > } > > - return sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev), > - cfg->clockevent_rating); > + ret = clk_prepare(p->clk); > + if (ret < 0) > + goto err2; > + > + ret = sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev), > + cfg->clockevent_rating); > + if (ret < 0) > + goto err3; > + > + return 0; > + err3: > + clk_unprepare(p->clk); > + err2: > + clk_put(p->clk); This one seems to be a fix and so needs to be in a separate patch... WBR, Sergei
Hi Sergei, On Tuesday 29 October 2013 15:15:09 Sergei Shtylyov wrote: > On 29-10-2013 2:49, Laurent Pinchart wrote: > > Prepare the clock at probe time, as there is no other appropriate place > > in the driver where we're allowed to sleep. > > > > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > > Cc: linux-kernel@vger.kernel.org > > Signed-off-by: Laurent Pinchart > > <laurent.pinchart+renesas@ideasonboard.com> > > --- > > > > drivers/clocksource/sh_mtu2.c | 16 ++++++++++++++-- > > 1 file changed, 14 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c > > index 4aac9ee..3cf1283 100644 > > --- a/drivers/clocksource/sh_mtu2.c > > +++ b/drivers/clocksource/sh_mtu2.c > > @@ -313,8 +313,20 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, > > struct platform_device *pdev)> > > goto err1; > > } > > > > - return sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev), > > - cfg->clockevent_rating); > > + ret = clk_prepare(p->clk); > > + if (ret < 0) > > + goto err2; > > + > > + ret = sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev), > > + cfg->clockevent_rating); > > + if (ret < 0) > > + goto err3; > > + > > + return 0; > > + err3: > > + clk_unprepare(p->clk); > > + err2: > > + clk_put(p->clk); > > This one seems to be a fix and so needs to be in a separate patch... I'll split the patch and repost (same for 03/12)
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c index 4aac9ee..3cf1283 100644 --- a/drivers/clocksource/sh_mtu2.c +++ b/drivers/clocksource/sh_mtu2.c @@ -313,8 +313,20 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev) goto err1; } - return sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev), - cfg->clockevent_rating); + ret = clk_prepare(p->clk); + if (ret < 0) + goto err2; + + ret = sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev), + cfg->clockevent_rating); + if (ret < 0) + goto err3; + + return 0; + err3: + clk_unprepare(p->clk); + err2: + clk_put(p->clk); err1: iounmap(p->mapbase); err0:
Prepare the clock at probe time, as there is no other appropriate place in the driver where we're allowed to sleep. Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: linux-kernel@vger.kernel.org Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/clocksource/sh_mtu2.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)