From: b.brezillon@overkiz.com (boris brezillon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] usb: ohci-at91: use device managed clk retrieval
Date: Tue, 03 Dec 2013 18:20:13 +0100 [thread overview]
Message-ID: <529E12CD.5040607@overkiz.com> (raw)
In-Reply-To: <529E1C82.8070501@cogentembedded.com>
Hello Sergei,
On 03/12/2013 19:01, Sergei Shtylyov wrote:
> Hello.
>
> On 12/03/2013 05:07 PM, Boris BREZILLON wrote:
>
>> Replace clk_get calls by devm_clk_get calls.
>
>> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
>> Tested-by: Robert Nelson <robertcnelson@gmail.com>
>> ---
>> drivers/usb/host/ohci-at91.c | 32 ++++++++------------------------
>> 1 file changed, 8 insertions(+), 24 deletions(-)
>
>> diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
>> index c406f1e..3652962 100644
>> --- a/drivers/usb/host/ohci-at91.c
>> +++ b/drivers/usb/host/ohci-at91.c
>> @@ -164,30 +164,30 @@ static int usb_hcd_at91_probe(const struct
>> hc_driver *driver,
>> goto err;
>> }
>>
>> - iclk = clk_get(&pdev->dev, "ohci_clk");
>> + iclk = devm_clk_get(dev, "ohci_clk");
>> if (IS_ERR(iclk)) {
>> - dev_err(&pdev->dev, "failed to get ohci_clk\n");
>> + dev_err(dev, "failed to get ohci_clk\n");
>
> You changed this call...
>
>> retval = PTR_ERR(iclk);
>> goto err;
>> }
>> - fclk = clk_get(&pdev->dev, "uhpck");
>> + fclk = devm_clk_get(dev, "uhpck");
>> if (IS_ERR(fclk)) {
>> dev_err(&pdev->dev, "failed to get uhpck\n");
>
> ... but not this one.
This is an oversight.
>
>> retval = PTR_ERR(fclk);
>> - goto err4;
>> + goto err;
>> }
>> - hclk = clk_get(&pdev->dev, "hclk");
>> + hclk = devm_clk_get(dev, "hclk");
>> if (IS_ERR(hclk)) {
>> dev_err(&pdev->dev, "failed to get hclk\n");
>
> ... or this one. Actually, I think cganging these calls would be
> out of scope for this patch.
Ditto.
I'll split the patch to in 2 patches:
1) replace &pdev->dev by dev
2) use devm_clk_get instead of clk_get.
>
>> retval = PTR_ERR(hclk);
>> - goto err5;
>> + goto err;
>> }
>> if (IS_ENABLED(CONFIG_COMMON_CLK)) {
>> - uclk = clk_get(&pdev->dev, "usb_clk");
>> + uclk = devm_clk_get(&pdev->dev, "usb_clk");
>
> Hm, why not 'dev' like in all of the above?
Ditto.
Thanks for your review.
Best Regards,
Boris
>
>> if (IS_ERR(uclk)) {
>> dev_err(&pdev->dev, "failed to get uclk\n");
>> retval = PTR_ERR(uclk);
>> - goto err6;
>> + goto err;
>> }
>> }
>>
>
> WBR, Sergei
>
>
prev parent reply other threads:[~2013-12-03 17:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-03 14:07 [PATCH 0/3] usb: ohci-at91: various fixes and improvements Boris BREZILLON
2013-12-03 14:07 ` [PATCH 1/3] usb: ohci-at91: fix irq and iomem resource retrieval Boris BREZILLON
2013-12-03 14:13 ` Nicolas Ferre
2013-12-03 14:07 ` [PATCH 2/3] usb: ohci-at91: replace request_mem_region + ioremap by devm_request_and_ioremap Boris BREZILLON
2013-12-03 14:14 ` Nicolas Ferre
2013-12-03 14:07 ` [PATCH 3/3] usb: ohci-at91: use device managed clk retrieval Boris BREZILLON
2013-12-03 14:15 ` Nicolas Ferre
2013-12-03 15:32 ` Alan Stern
2013-12-04 8:32 ` boris brezillon
2013-12-04 15:21 ` Alan Stern
2013-12-04 15:51 ` Douglas Gilbert
2013-12-04 15:59 ` Tomasz Figa
2013-12-03 18:01 ` Sergei Shtylyov
2013-12-03 17:20 ` boris brezillon [this message]
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=529E12CD.5040607@overkiz.com \
--to=b.brezillon@overkiz.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 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).