From: Sascha Hauer <s.hauer@pengutronix.de>
To: Fabio Estevam <fabio.estevam@freescale.com>
Cc: zbr@ioremap.net, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 1/3] w1: mxc_w1: Adapt the clock name to the new clock framework
Date: Wed, 3 Oct 2012 12:11:12 +0200 [thread overview]
Message-ID: <20121003101112.GD1322@pengutronix.de> (raw)
In-Reply-To: <1346950139-17059-1-git-send-email-fabio.estevam@freescale.com>
On Thu, Sep 06, 2012 at 01:48:59PM -0300, Fabio Estevam wrote:
> 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>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
> -----
> 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
>
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
next prev parent reply other threads:[~2012-10-03 10:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2012-11-19 10:07 ` Sascha Hauer
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=20121003101112.GD1322@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=fabio.estevam@freescale.com \
--cc=linux-kernel@vger.kernel.org \
--cc=zbr@ioremap.net \
/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 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).