lkml.org 
[lkml]   [2012]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 1/3] w1: mxc_w1: Adapt the clock name to the new clock framework
Date
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



\
 
 \ /
  Last update: 2012-09-06 19:41    [W:0.057 / U:0.064 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site