linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 1/3] w1: mxc_w1: Adapt the clock name to the new clock framework
@ 2012-09-06 16:48 Fabio Estevam
  2012-10-01 17:51 ` Fabio Estevam
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Fabio Estevam @ 2012-09-06 16:48 UTC (permalink / raw)
  To: zbr; +Cc: s.hauer, linux-kernel, Fabio Estevam

With the new i.mx clock framework the mxc_w1 clock is registered as:

clk_register_clkdev(clk[owire_gate], NULL, "mxc_w1.0"

So we do not need to pass "owire" string and can use NULL instead.

While at it, also fix the clock error handling code.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
-----
Changes since v1:
- Fix clock error handling
 drivers/w1/masters/mxc_w1.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 1cc61a7..960b362 100644
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -117,11 +117,11 @@ static int __devinit mxc_w1_probe(struct platform_device *pdev)
 	if (!mdev)
 		return -ENOMEM;
 
-	mdev->clk = clk_get(&pdev->dev, "owire");
-	if (!mdev->clk) {
-		err = -ENODEV;
-		goto failed_clk;
-	}
+	mdev->clk = clk_get(&pdev->dev, NULL);
+	if (IS_ERR(mdev->clk)) {
+		err = PTR_ERR(mdev->clk);
+		goto failed_clk;
+	}
 
 	mdev->clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1;
 
-- 
1.7.9.5



^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2012-11-19 10:07 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-06 16:48 [PATCH v2 1/3] w1: mxc_w1: Adapt the clock name to the new clock framework Fabio Estevam
2012-10-01 17:51 ` Fabio Estevam
2012-10-02  5:32   ` Evgeniy Polyakov
2012-10-03  1:04     ` Fabio Estevam
2012-10-03  7:28       ` Evgeniy Polyakov
2012-11-19  1:56         ` Fabio Estevam
2012-11-19  2:18           ` GregKH
2012-10-03 10:11 ` Sascha Hauer
2012-11-19 10:07 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).