From: Robert Hancock <robert.hancock@calian.com>
To: linux-usb@vger.kernel.org
Cc: balbi@kernel.org, gregkh@linuxfoundation.org,
michal.simek@xilinx.com, manish.narani@xilinx.com,
sean.anderson@seco.com, robh+dt@kernel.org,
devicetree@vger.kernel.org, piyush.mehta@xilinx.com,
Robert Hancock <robert.hancock@calian.com>
Subject: [PATCH v7 2/4] usb: dwc3: xilinx: Fix error handling when getting USB3 PHY
Date: Tue, 25 Jan 2022 18:02:51 -0600 [thread overview]
Message-ID: <20220126000253.1586760-3-robert.hancock@calian.com> (raw)
In-Reply-To: <20220126000253.1586760-1-robert.hancock@calian.com>
The code that looked up the USB3 PHY was ignoring all errors other than
EPROBE_DEFER in an attempt to handle the PHY not being present. Fix and
simplify the code by using devm_phy_optional_get and dev_err_probe so
that a missing PHY is not treated as an error and unexpected errors
are handled properly.
Fixes: 84770f028fab ("usb: dwc3: Add driver for Xilinx platforms")
Signed-off-by: Robert Hancock <robert.hancock@calian.com>
---
drivers/usb/dwc3/dwc3-xilinx.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-xilinx.c b/drivers/usb/dwc3/dwc3-xilinx.c
index 06b591b14b09..e14ac15e24c3 100644
--- a/drivers/usb/dwc3/dwc3-xilinx.c
+++ b/drivers/usb/dwc3/dwc3-xilinx.c
@@ -102,12 +102,12 @@ static int dwc3_xlnx_init_zynqmp(struct dwc3_xlnx *priv_data)
int ret;
u32 reg;
- usb3_phy = devm_phy_get(dev, "usb3-phy");
- if (PTR_ERR(usb3_phy) == -EPROBE_DEFER) {
- ret = -EPROBE_DEFER;
+ usb3_phy = devm_phy_optional_get(dev, "usb3-phy");
+ if (IS_ERR(usb3_phy)) {
+ ret = PTR_ERR(usb3_phy);
+ dev_err_probe(dev, ret,
+ "failed to get USB3 PHY\n");
goto err;
- } else if (IS_ERR(usb3_phy)) {
- usb3_phy = NULL;
}
/*
--
2.31.1
next prev parent reply other threads:[~2022-01-26 0:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-26 0:02 [PATCH v7 0/4] Xilinx ZynqMP USB fixes Robert Hancock
2022-01-26 0:02 ` [PATCH v7 1/4] usb: dwc3: xilinx: Skip resets and USB3 register settings for USB2.0 mode Robert Hancock
2022-01-26 0:02 ` Robert Hancock [this message]
2022-01-26 0:02 ` [PATCH v7 3/4] dt-bindings: usb: dwc3-xilinx: Added reset-gpios Robert Hancock
2022-01-26 0:02 ` [PATCH v7 4/4] usb: dwc3: xilinx: Add ULPI PHY reset handling Robert Hancock
2022-01-26 23:01 ` Robert Hancock
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=20220126000253.1586760-3-robert.hancock@calian.com \
--to=robert.hancock@calian.com \
--cc=balbi@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
--cc=manish.narani@xilinx.com \
--cc=michal.simek@xilinx.com \
--cc=piyush.mehta@xilinx.com \
--cc=robh+dt@kernel.org \
--cc=sean.anderson@seco.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.