aboutsummaryrefslogtreecommitdiff
path: root/drivers/w1
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2012-11-19 10:19:46 -0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 12:40:14 -0800
commit99ba2fd297ed475dc6782e9029d4da041a85706a (patch)
treedfae4a6feaced7e601f909bc6de8ab12a4a383d1 /drivers/w1
parent98c4514ff6e3072288770db66f91bdb15af8b433 (diff)
downloadlinux-99ba2fd297ed475dc6782e9029d4da041a85706a.tar.gz
w1: mxc_w1: Adapt the clock name to the new clock framework
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. Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> ----- Changes since v2: - Add Ack's Changes since v1: - Fix clock error handling drivers/w1/masters/mxc_w1.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1')
-rw-r--r--drivers/w1/masters/mxc_w1.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 1cc61a700fa..12c1ab844d8 100644
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -117,9 +117,9 @@ 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;
+ mdev->clk = clk_get(&pdev->dev, NULL);
+ if (IS_ERR(mdev->clk)) {
+ err = PTR_ERR(mdev->clk);
goto failed_clk;
}