All of lore.kernel.org
 help / color / mirror / Atom feed
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/12] clocksource: sh_tmu: Add clk_prepare/unprepare support
Date: Mon, 28 Oct 2013 22:49:20 +0000	[thread overview]
Message-ID: <1383000569-8916-4-git-send-email-laurent.pinchart+renesas@ideasonboard.com> (raw)
In-Reply-To: <1383000569-8916-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com>

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_tmu.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index 78b8dae..63557cd 100644
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -472,12 +472,26 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev)
 		ret = PTR_ERR(p->clk);
 		goto err1;
 	}
+
+	ret = clk_prepare(p->clk);
+	if (ret < 0)
+		goto err2;
+
 	p->cs_enabled = false;
 	p->enable_count = 0;
 
-	return sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),
-			       cfg->clockevent_rating,
-			       cfg->clocksource_rating);
+	ret = sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),
+			      cfg->clockevent_rating,
+			      cfg->clocksource_rating);
+	if (ret < 0)
+		goto err3;
+
+	return 0;
+
+ err3:
+	clk_unprepare(p->clk);
+ err2:
+	clk_put(p->clk);
  err1:
 	iounmap(p->mapbase);
  err0:
-- 
1.8.1.5


WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-sh@vger.kernel.org, Mike Turquette <mturquette@linaro.org>,
	Daniel Lezcano <daniel.lezcano@linaro.org>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 03/12] clocksource: sh_tmu: Add clk_prepare/unprepare support
Date: Mon, 28 Oct 2013 23:49:20 +0100	[thread overview]
Message-ID: <1383000569-8916-4-git-send-email-laurent.pinchart+renesas@ideasonboard.com> (raw)
In-Reply-To: <1383000569-8916-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com>

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_tmu.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index 78b8dae..63557cd 100644
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -472,12 +472,26 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev)
 		ret = PTR_ERR(p->clk);
 		goto err1;
 	}
+
+	ret = clk_prepare(p->clk);
+	if (ret < 0)
+		goto err2;
+
 	p->cs_enabled = false;
 	p->enable_count = 0;
 
-	return sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),
-			       cfg->clockevent_rating,
-			       cfg->clocksource_rating);
+	ret = sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),
+			      cfg->clockevent_rating,
+			      cfg->clocksource_rating);
+	if (ret < 0)
+		goto err3;
+
+	return 0;
+
+ err3:
+	clk_unprepare(p->clk);
+ err2:
+	clk_put(p->clk);
  err1:
 	iounmap(p->mapbase);
  err0:
-- 
1.8.1.5


WARNING: multiple messages have this Message-ID (diff)
From: laurent.pinchart+renesas@ideasonboard.com (Laurent Pinchart)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/12] clocksource: sh_tmu: Add clk_prepare/unprepare support
Date: Mon, 28 Oct 2013 23:49:20 +0100	[thread overview]
Message-ID: <1383000569-8916-4-git-send-email-laurent.pinchart+renesas@ideasonboard.com> (raw)
In-Reply-To: <1383000569-8916-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com>

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 at vger.kernel.org
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/clocksource/sh_tmu.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index 78b8dae..63557cd 100644
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -472,12 +472,26 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev)
 		ret = PTR_ERR(p->clk);
 		goto err1;
 	}
+
+	ret = clk_prepare(p->clk);
+	if (ret < 0)
+		goto err2;
+
 	p->cs_enabled = false;
 	p->enable_count = 0;
 
-	return sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),
-			       cfg->clockevent_rating,
-			       cfg->clocksource_rating);
+	ret = sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),
+			      cfg->clockevent_rating,
+			      cfg->clocksource_rating);
+	if (ret < 0)
+		goto err3;
+
+	return 0;
+
+ err3:
+	clk_unprepare(p->clk);
+ err2:
+	clk_put(p->clk);
  err1:
 	iounmap(p->mapbase);
  err0:
-- 
1.8.1.5

  parent reply	other threads:[~2013-10-28 22:49 UTC|newest]

Thread overview: 202+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-28 22:49 [PATCH 00/12] Prepare various SH/R Mobile/Car drivers for CCF migration Laurent Pinchart
2013-10-28 22:49 ` Laurent Pinchart
2013-10-28 22:49 ` Laurent Pinchart
2013-10-28 22:49 ` [PATCH 01/12] clocksource: sh_cmt: Add clk_prepare/unprepare support Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-29  5:55   ` Simon Horman
2013-10-29  5:55     ` Simon Horman
2013-10-29  5:55     ` Simon Horman
2013-10-29  9:55     ` Laurent Pinchart
2013-10-29  9:55       ` Laurent Pinchart
2013-10-29  9:55       ` Laurent Pinchart
2013-10-30  0:10       ` Simon Horman
2013-10-30  0:10         ` Simon Horman
2013-10-30  0:10         ` Simon Horman
2013-10-30  0:13         ` Laurent Pinchart
2013-10-30  0:13           ` Laurent Pinchart
2013-10-30  0:13           ` Laurent Pinchart
2013-10-30  0:27           ` Simon Horman
2013-10-30  0:27             ` Simon Horman
2013-10-30  0:27             ` Simon Horman
2013-10-28 22:49 ` [PATCH 02/12] clocksource: sh_mtu2: " Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-29  5:55   ` Simon Horman
2013-10-29  5:55     ` Simon Horman
2013-10-29  5:55     ` Simon Horman
2013-10-29 11:15   ` Sergei Shtylyov
2013-10-29 11:15     ` Sergei Shtylyov
2013-10-29 11:15     ` Sergei Shtylyov
2013-10-29 13:24     ` Laurent Pinchart
2013-10-29 13:24       ` Laurent Pinchart
2013-10-29 13:24       ` Laurent Pinchart
2013-10-29 14:30   ` [PATCH v2 1/2] clocksource: sh_mtu2: Release clock when sh_mtu2_register() fails Laurent Pinchart
2013-10-29 14:30     ` Laurent Pinchart
2013-10-29 14:30     ` Laurent Pinchart
2013-10-29 14:30     ` [PATCH v2 2/2] clocksource: sh_mtu2: Add clk_prepare/unprepare support Laurent Pinchart
2013-10-29 14:30       ` Laurent Pinchart
2013-10-29 14:30       ` Laurent Pinchart
2013-10-31  5:23       ` Simon Horman
2013-10-31  5:23         ` Simon Horman
2013-10-31  5:23         ` Simon Horman
2013-11-08 10:10       ` Daniel Lezcano
2013-11-08 10:10         ` Daniel Lezcano
2013-11-08 10:10         ` Daniel Lezcano
2013-10-31  5:23     ` [PATCH v2 1/2] clocksource: sh_mtu2: Release clock when sh_mtu2_register() fails Simon Horman
2013-10-31  5:23       ` Simon Horman
2013-10-31  5:23       ` Simon Horman
2013-11-08 10:10     ` Daniel Lezcano
2013-11-08 10:10       ` Daniel Lezcano
2013-11-08 10:10       ` Daniel Lezcano
2013-10-28 22:49 ` Laurent Pinchart [this message]
2013-10-28 22:49   ` [PATCH 03/12] clocksource: sh_tmu: Add clk_prepare/unprepare support Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-29  5:55   ` Simon Horman
2013-10-29  5:55     ` Simon Horman
2013-10-29  5:55     ` Simon Horman
2013-10-29 11:17   ` Sergei Shtylyov
2013-10-29 11:17     ` Sergei Shtylyov
2013-10-29 11:17     ` Sergei Shtylyov
2013-10-29 14:31   ` [PATCH v2 1/2] clocksource: sh_tmu: Release clock when sh_tmu_register() fails Laurent Pinchart
2013-10-29 14:31     ` Laurent Pinchart
2013-10-29 14:31     ` Laurent Pinchart
2013-10-29 14:31     ` [PATCH v2 2/2] clocksource: sh_tmu: Add clk_prepare/unprepare support Laurent Pinchart
2013-10-29 14:31       ` Laurent Pinchart
2013-10-29 14:31       ` Laurent Pinchart
2013-10-31  5:24       ` Simon Horman
2013-10-31  5:24         ` Simon Horman
2013-10-31  5:24         ` Simon Horman
2013-11-07 13:40         ` Daniel Lezcano
2013-11-07 13:40           ` Daniel Lezcano
2013-11-07 13:40           ` Daniel Lezcano
2013-11-08  5:22           ` Simon Horman
2013-11-08  5:22             ` Simon Horman
2013-11-08  5:22             ` Simon Horman
2013-11-08 10:10       ` Daniel Lezcano
2013-11-08 10:10         ` Daniel Lezcano
2013-11-08 10:10         ` Daniel Lezcano
2013-10-31  5:23     ` [PATCH v2 1/2] clocksource: sh_tmu: Release clock when sh_tmu_register() fails Simon Horman
2013-10-31  5:23       ` Simon Horman
2013-10-31  5:23       ` Simon Horman
2013-11-08 10:10     ` Daniel Lezcano
2013-11-08 10:10       ` Daniel Lezcano
2013-11-08 10:10       ` Daniel Lezcano
2013-10-28 22:49 ` [PATCH 04/12] sata_rcar: Convert to clk_prepare/unprepare Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-29 18:41   ` Tejun Heo
2013-10-29 18:41     ` Tejun Heo
2013-10-29 18:41     ` Tejun Heo
2013-10-28 22:49 ` [PATCH 05/12] drm: shmob_drm: " Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-11-09 12:51   ` Laurent Pinchart
2013-11-11  8:55     ` Thierry Reding
2013-11-11 12:55       ` Laurent Pinchart
2013-10-28 22:49 ` [PATCH 06/12] i2c: sh_mobile: " Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-29  5:02   ` Wolfram Sang
2013-10-29  5:02     ` Wolfram Sang
2013-10-29  5:02     ` Wolfram Sang
2013-10-29  5:58     ` Simon Horman
2013-10-29  5:58       ` Simon Horman
2013-10-29  5:58       ` Simon Horman
2013-10-29  9:41       ` Laurent Pinchart
2013-10-29  9:41         ` Laurent Pinchart
2013-10-29  9:41         ` Laurent Pinchart
2013-10-31 11:49   ` Wolfram Sang
2013-10-31 11:49     ` Wolfram Sang
2013-10-31 11:49     ` Wolfram Sang
2013-10-28 22:49 ` [PATCH 07/12] mmc: sh_mmcif: " Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-29  8:10   ` Guennadi Liakhovetski
2013-10-29  8:10     ` Guennadi Liakhovetski
2013-10-29  8:10     ` Guennadi Liakhovetski
2013-10-30 22:23     ` Guennadi Liakhovetski
2013-10-30 22:23       ` Guennadi Liakhovetski
2013-10-30 22:23       ` Guennadi Liakhovetski
2013-10-30 23:13       ` Laurent Pinchart
2013-10-30 23:13         ` Laurent Pinchart
2013-10-30 23:13         ` Laurent Pinchart
2013-10-30 23:27         ` Ulf Hansson
2013-10-30 23:27           ` Ulf Hansson
2013-10-30 23:27           ` Ulf Hansson
2013-10-30 23:48           ` Laurent Pinchart
2013-10-30 23:48             ` Laurent Pinchart
2013-10-30 23:48             ` Laurent Pinchart
2013-10-28 22:49 ` [PATCH 08/12] mmc: sh_mobile_sdhi: " Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-29  8:09   ` Guennadi Liakhovetski
2013-10-29  8:09     ` Guennadi Liakhovetski
2013-10-29  8:09     ` Guennadi Liakhovetski
2013-11-09 12:56     ` Laurent Pinchart
2013-11-09 12:56       ` Laurent Pinchart
2013-11-09 12:56       ` Laurent Pinchart
2013-11-26  2:02       ` Laurent Pinchart
2013-11-26  2:02         ` Laurent Pinchart
2013-11-26  2:02         ` Laurent Pinchart
2013-12-11 12:01         ` Laurent Pinchart
2013-12-11 12:01           ` Laurent Pinchart
2013-12-11 12:01           ` Laurent Pinchart
2013-12-12  1:29           ` Chris Ball
2013-12-12  1:29             ` Chris Ball
2013-12-12  1:29             ` Chris Ball
2013-12-12  2:16             ` Laurent Pinchart
2013-12-12  2:16               ` Laurent Pinchart
2013-12-12  2:16               ` Laurent Pinchart
2013-12-12  2:25               ` Chris Ball
2013-12-12  2:25                 ` Chris Ball
2013-12-12  2:25                 ` Chris Ball
2013-12-14  1:05                 ` Simon Horman
2013-12-14  1:05                   ` Simon Horman
2013-12-14  1:05                   ` Simon Horman
2013-10-28 22:49 ` [PATCH 09/12] usb: gadget: r8a66597-udc: " Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-29  9:47   ` Shimoda, Yoshihiro
2013-10-29  9:47     ` Shimoda, Yoshihiro
2013-11-09 14:09     ` Laurent Pinchart
2013-11-09 14:09       ` Laurent Pinchart
2013-11-11 19:53       ` Felipe Balbi
2013-11-11 19:53         ` Felipe Balbi
2013-11-26  1:59         ` Laurent Pinchart
2013-11-26  1:59           ` Laurent Pinchart
2013-11-26  2:12           ` Felipe Balbi
2013-11-26  2:12             ` Felipe Balbi
2013-11-26  2:16             ` Laurent Pinchart
2013-11-26  2:16               ` Laurent Pinchart
2013-11-26 19:54               ` Felipe Balbi
2013-11-26 19:54                 ` Felipe Balbi
2013-11-26 21:43                 ` Laurent Pinchart
2013-11-26 21:43                   ` Laurent Pinchart
2013-10-28 22:49 ` [PATCH 10/12] usb: r8a66597-hcd: " Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-29  9:47   ` Shimoda, Yoshihiro
2013-10-29  9:47     ` Shimoda, Yoshihiro
2013-11-09 14:12     ` Laurent Pinchart
2013-11-09 14:12       ` Laurent Pinchart
2013-11-09 16:10       ` Greg Kroah-Hartman
2013-11-09 16:10         ` Greg Kroah-Hartman
2013-11-26  2:00         ` Laurent Pinchart
2013-11-26  2:00           ` Laurent Pinchart
2013-11-26  2:36           ` Greg Kroah-Hartman
2013-11-26  2:36             ` Greg Kroah-Hartman
2013-11-26 14:08             ` Laurent Pinchart
2013-11-26 14:08               ` Laurent Pinchart
2013-11-28  8:20               ` Simon Horman
2013-11-28  8:20                 ` Simon Horman
2013-10-28 22:49 ` [PATCH 11/12] fbdev: shmobile-hdmi: " Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-31 10:48   ` Jean-Christophe PLAGNIOL-VILLARD
2013-10-31 10:48     ` Jean-Christophe PLAGNIOL-VILLARD
2013-11-09 14:13     ` Laurent Pinchart
2013-11-09 14:13       ` Laurent Pinchart
2013-11-11 13:34       ` Tomi Valkeinen
2013-11-11 13:34         ` Tomi Valkeinen
2013-10-28 22:49 ` [PATCH 12/12] fbdev: shmobile-lcdcfb: " Laurent Pinchart
2013-10-28 22:49   ` Laurent Pinchart
2013-10-31 10:47   ` Jean-Christophe PLAGNIOL-VILLARD
2013-10-31 10:47     ` Jean-Christophe PLAGNIOL-VILLARD

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1383000569-8916-4-git-send-email-laurent.pinchart+renesas@ideasonboard.com \
    --to=laurent.pinchart+renesas@ideasonboard.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.