summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayne Chang <waynec@nvidia.com>2022-09-27 21:45:12 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-10-24 09:58:29 +0200
commit72b67ce35bcc8e46f44bf27acbc85c29b4431af8 (patch)
tree28a5545b07e9324f8a1b4824ce50d4205f58d664
parent1d5ad0a874ddfcee9f932f54b1d34cbe8b9ddcfe (diff)
downloadlinux-stable-72b67ce35bcc8e46f44bf27acbc85c29b4431af8.tar.gz
linux-stable-72b67ce35bcc8e46f44bf27acbc85c29b4431af8.zip
usb: typec: ucsi: Don't warn on probe deferral
[ Upstream commit fce703a991b7e8c7e1371de95b9abaa832ecf9c3 ] Deferred probe is an expected return value for fwnode_usb_role_switch_get(). Given that the driver deals with it properly, there's no need to output a warning that may potentially confuse users. -- V2 -> V3: remove the Fixes and Cc V1 -> V2: adjust the coding style for better reading format. drivers/usb/typec/ucsi/ucsi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) Signed-off-by: Wayne Chang <waynec@nvidia.com> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://lore.kernel.org/r/20220927134512.2651067-1-waynec@nvidia.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/usb/typec/ucsi/ucsi.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index 6364f0d467ea..74fb5a4c6f21 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -1067,11 +1067,9 @@ static int ucsi_register_port(struct ucsi *ucsi, int index)
cap->fwnode = ucsi_find_fwnode(con);
con->usb_role_sw = fwnode_usb_role_switch_get(cap->fwnode);
- if (IS_ERR(con->usb_role_sw)) {
- dev_err(ucsi->dev, "con%d: failed to get usb role switch\n",
- con->num);
- return PTR_ERR(con->usb_role_sw);
- }
+ if (IS_ERR(con->usb_role_sw))
+ return dev_err_probe(ucsi->dev, PTR_ERR(con->usb_role_sw),
+ "con%d: failed to get usb role switch\n", con->num);
/* Delay other interactions with the con until registration is complete */
mutex_lock(&con->lock);