From: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Peter Chen <Peter.Chen@nxp.com>
Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org
Subject: [PATCH 3/5] usb: chipidea: usb2: make clock optional
Date: Sat, 04 Apr 2020 02:00:05 +0200 [thread overview]
Message-ID: <ee26f5ed9760a22fcda93531c6c53a0e112e5509.1585958250.git.mirq-linux@rere.qmqm.pl> (raw)
In-Reply-To: <2b6d70595475a3ddbd5bb8ae1765868a98c404b6.1585958250.git.mirq-linux@rere.qmqm.pl>
Allow clock to be missing from DT (assume it's enabled then).
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/usb/chipidea/ci_hdrc_usb2.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/usb/chipidea/ci_hdrc_usb2.c b/drivers/usb/chipidea/ci_hdrc_usb2.c
index bf300a234e64..9086514840ed 100644
--- a/drivers/usb/chipidea/ci_hdrc_usb2.c
+++ b/drivers/usb/chipidea/ci_hdrc_usb2.c
@@ -64,13 +64,14 @@ static int ci_hdrc_usb2_probe(struct platform_device *pdev)
if (!priv)
return -ENOMEM;
- priv->clk = devm_clk_get(dev, NULL);
- if (!IS_ERR(priv->clk)) {
- ret = clk_prepare_enable(priv->clk);
- if (ret) {
- dev_err(dev, "failed to enable the clock: %d\n", ret);
- return ret;
- }
+ priv->clk = devm_clk_get_optional(dev, NULL);
+ if (IS_ERR(priv->clk))
+ return PTR_ERR(priv->clk);;
+
+ ret = clk_prepare_enable(priv->clk);
+ if (ret) {
+ dev_err(dev, "failed to enable the clock: %d\n", ret);
+ return ret;
}
ci_pdata->name = dev_name(dev);
@@ -94,8 +95,7 @@ static int ci_hdrc_usb2_probe(struct platform_device *pdev)
return 0;
clk_err:
- if (!IS_ERR(priv->clk))
- clk_disable_unprepare(priv->clk);
+ clk_disable_unprepare(priv->clk);
return ret;
}
--
2.20.1
next prev parent reply other threads:[~2020-04-04 0:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 23:59 [PATCH 1/5] usb: chipidea: usb2: constify zynq_pdata Michał Mirosław
2020-04-04 0:00 ` Michał Mirosław [this message]
2020-04-04 0:00 ` [PATCH 2/5] usb: chipidea: usb2: fix formatting Michał Mirosław
2020-04-04 0:00 ` [PATCH 4/5] usb: chipidea: usb2: absorb zevio glue driver Michał Mirosław
2020-04-04 0:00 ` [PATCH 5/5] usb: chipidea: allow disabling glue drivers if EMBEDDED Michał Mirosław
2020-04-07 3:12 ` Peter Chen
2020-04-07 20:00 ` Michał Mirosław
2020-04-08 1:41 ` Peter Chen
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=ee26f5ed9760a22fcda93531c6c53a0e112e5509.1585958250.git.mirq-linux@rere.qmqm.pl \
--to=mirq-linux@rere.qmqm.pl \
--cc=Peter.Chen@nxp.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.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).