From: peter.chen@freescale.com (Peter Chen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v13 03/14] usb: chipidea: imx: add return value check for devm_regulator_get
Date: Fri, 26 Jul 2013 17:18:19 +0800 [thread overview]
Message-ID: <1374830310-21765-4-git-send-email-peter.chen@freescale.com> (raw)
In-Reply-To: <1374830310-21765-1-git-send-email-peter.chen@freescale.com>
- If devm_regulator_get returns -EPROBE_DEFER, we also return
-EPROBE_DEFER to wait regulator being ready later.
- If devm_regulator_get returns -ENODEV, we think there is
no "vbus-supply" node at DT, it means this board doesn't need
vbus control.
- If devm_regulator_get returns other error values, it means
there are something wrong for getting this regulator.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
drivers/usb/chipidea/ci_hdrc_imx.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index d06355e..0ced8c1 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -144,8 +144,18 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
/* Get the vbus regulator */
pdata.reg_vbus = devm_regulator_get(&pdev->dev, "vbus");
- if (IS_ERR(pdata.reg_vbus))
- pdata.reg_vbus = NULL;
+ if (PTR_ERR(pdata.reg_vbus) == -EPROBE_DEFER) {
+ ret = -EPROBE_DEFER;
+ goto err_clk;
+ } else if (PTR_ERR(pdata.reg_vbus) == -ENODEV) {
+ pdata.reg_vbus = NULL; /* no vbus regualator is needed */
+ } else if (IS_ERR(pdata.reg_vbus)) {
+ dev_err(&pdev->dev,
+ "Getting regulator error: %ld\n",
+ PTR_ERR(pdata.reg_vbus));
+ ret = PTR_ERR(pdata.reg_vbus);
+ goto err_clk;
+ }
if (!pdev->dev.dma_mask)
pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
--
1.7.0.4
next prev parent reply other threads:[~2013-07-26 9:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-26 9:18 [PATCH v13 00/14] Add tested id switch and vbus connect detect support for Chipidea Peter Chen
2013-07-26 9:18 ` [PATCH v13 01/14] usb: chipidea: add vbus regulator control Peter Chen
2013-07-26 9:18 ` [PATCH v13 02/14] usb: chipidea: imx: remove vbus regulator operation Peter Chen
2013-07-29 22:30 ` Michael Grzeschik
2013-07-30 1:46 ` Peter Chen
2013-07-26 9:18 ` Peter Chen [this message]
2013-07-29 22:47 ` [PATCH v13 03/14] usb: chipidea: imx: add return value check for devm_regulator_get Michael Grzeschik
2013-07-30 1:50 ` Peter Chen
2013-07-26 9:18 ` [PATCH v13 04/14] usb: chipidea: udc: otg_set_peripheral is useless for some chipidea users Peter Chen
2013-07-26 9:18 ` [PATCH v13 05/14] usb: chipidea: otg: Add otg file used to access otgsc Peter Chen
2013-07-26 9:18 ` [PATCH v13 06/14] usb: chipidea: Add role init and destory APIs Peter Chen
2013-07-26 9:18 ` [PATCH v13 07/14] usb: chipidea: add flag CI_HDRC_DUAL_ROLE_NOT_OTG Peter Chen
2013-07-26 9:18 ` [PATCH v13 08/14] usb: chipidea: disable all interrupts and clear all interrupts status Peter Chen
2013-07-26 9:18 ` [PATCH v13 09/14] usb: chipidea: move otg relate things to otg file Peter Chen
2013-07-26 9:18 ` [PATCH v13 10/14] usb: chipidea: add vbus interrupt handler Peter Chen
2013-07-26 9:18 ` [PATCH v13 11/14] usb: chipidea: add wait vbus lower than OTGSC_BSV before role starts Peter Chen
2013-07-26 9:18 ` [PATCH v13 12/14] usb: chipidea: udc: misuse flag CI_HDRC_REGS_SHARED and CI_HDRC_PULLUP_ON_VBUS Peter Chen
2013-07-26 9:18 ` [PATCH v13 13/14] usb: chipidea: udc: .pullup is valid when vbus is on at CI_HDRC_PULLUP_ON_VBUS Peter Chen
2013-07-26 9:18 ` [PATCH v13 14/14] usb: chipidea: udc: fix the oops when plugs in usb cable after rmmod gadget Peter Chen
2013-07-31 14:14 ` [PATCH v13 00/14] Add tested id switch and vbus connect detect support for Chipidea Chen Peter-B29397
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=1374830310-21765-4-git-send-email-peter.chen@freescale.com \
--to=peter.chen@freescale.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).