|
Oliver Neukum |
838022 |
From d090c7a2ab84663185e4abda21d7d83880937c8a Mon Sep 17 00:00:00 2001
|
|
Oliver Neukum |
838022 |
From: Kushagra Verma <kushagra765@outlook.com>
|
|
Oliver Neukum |
838022 |
Date: Wed, 11 May 2022 21:19:36 +0530
|
|
Oliver Neukum |
838022 |
Subject: [PATCH] USB / dwc3: Fix a checkpatch warning in core.c
|
|
Oliver Neukum |
838022 |
Git-commit: d090c7a2ab84663185e4abda21d7d83880937c8a
|
|
Oliver Neukum |
838022 |
References: git-fixes
|
|
Oliver Neukum |
838022 |
Patch-mainline: v5.19-rc1
|
|
Oliver Neukum |
838022 |
|
|
Oliver Neukum |
838022 |
This patch fixes the following checkpatch.pl warning in core.c:
|
|
Oliver Neukum |
838022 |
WARNING: braces {} are not necessary for any arm of this statement
|
|
Oliver Neukum |
838022 |
|
|
Oliver Neukum |
838022 |
Signed-off-by: Kushagra Verma <kushagra765@outlook.com>
|
|
Oliver Neukum |
838022 |
Link: https://lore.kernel.org/r/TYZPR01MB39354534E2F9EE4E022DDAFFF8C89@TYZPR01MB3935.apcprd01.prod.exchangelabs.com
|
|
Oliver Neukum |
838022 |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Oliver Neukum |
838022 |
Signed-off-by: Oliver Neukum <oneukum@suse.com>
|
|
Oliver Neukum |
838022 |
---
|
|
Oliver Neukum |
838022 |
drivers/usb/dwc3/core.c | 20 ++++++++------------
|
|
Oliver Neukum |
838022 |
1 file changed, 8 insertions(+), 12 deletions(-)
|
|
Oliver Neukum |
838022 |
|
|
Oliver Neukum |
838022 |
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
|
|
Oliver Neukum |
838022 |
index 7d023130e145..c78205c5e19f 100644
|
|
Oliver Neukum |
838022 |
--- a/drivers/usb/dwc3/core.c
|
|
Oliver Neukum |
838022 |
+++ b/drivers/usb/dwc3/core.c
|
|
Oliver Neukum |
838022 |
@@ -1266,40 +1266,36 @@ static int dwc3_core_get_phy(struct dwc3 *dwc)
|
|
Oliver Neukum |
838022 |
|
|
Oliver Neukum |
838022 |
if (IS_ERR(dwc->usb2_phy)) {
|
|
Oliver Neukum |
838022 |
ret = PTR_ERR(dwc->usb2_phy);
|
|
Oliver Neukum |
838022 |
- if (ret == -ENXIO || ret == -ENODEV) {
|
|
Oliver Neukum |
838022 |
+ if (ret == -ENXIO || ret == -ENODEV)
|
|
Oliver Neukum |
838022 |
dwc->usb2_phy = NULL;
|
|
Oliver Neukum |
838022 |
- } else {
|
|
Oliver Neukum |
838022 |
+ else
|
|
Oliver Neukum |
838022 |
return dev_err_probe(dev, ret, "no usb2 phy configured\n");
|
|
Oliver Neukum |
838022 |
- }
|
|
Oliver Neukum |
838022 |
}
|
|
Oliver Neukum |
838022 |
|
|
Oliver Neukum |
838022 |
if (IS_ERR(dwc->usb3_phy)) {
|
|
Oliver Neukum |
838022 |
ret = PTR_ERR(dwc->usb3_phy);
|
|
Oliver Neukum |
838022 |
- if (ret == -ENXIO || ret == -ENODEV) {
|
|
Oliver Neukum |
838022 |
+ if (ret == -ENXIO || ret == -ENODEV)
|
|
Oliver Neukum |
838022 |
dwc->usb3_phy = NULL;
|
|
Oliver Neukum |
838022 |
- } else {
|
|
Oliver Neukum |
838022 |
+ else
|
|
Oliver Neukum |
838022 |
return dev_err_probe(dev, ret, "no usb3 phy configured\n");
|
|
Oliver Neukum |
838022 |
- }
|
|
Oliver Neukum |
838022 |
}
|
|
Oliver Neukum |
838022 |
|
|
Oliver Neukum |
838022 |
dwc->usb2_generic_phy = devm_phy_get(dev, "usb2-phy");
|
|
Oliver Neukum |
838022 |
if (IS_ERR(dwc->usb2_generic_phy)) {
|
|
Oliver Neukum |
838022 |
ret = PTR_ERR(dwc->usb2_generic_phy);
|
|
Oliver Neukum |
838022 |
- if (ret == -ENOSYS || ret == -ENODEV) {
|
|
Oliver Neukum |
838022 |
+ if (ret == -ENOSYS || ret == -ENODEV)
|
|
Oliver Neukum |
838022 |
dwc->usb2_generic_phy = NULL;
|
|
Oliver Neukum |
838022 |
- } else {
|
|
Oliver Neukum |
838022 |
+ else
|
|
Oliver Neukum |
838022 |
return dev_err_probe(dev, ret, "no usb2 phy configured\n");
|
|
Oliver Neukum |
838022 |
- }
|
|
Oliver Neukum |
838022 |
}
|
|
Oliver Neukum |
838022 |
|
|
Oliver Neukum |
838022 |
dwc->usb3_generic_phy = devm_phy_get(dev, "usb3-phy");
|
|
Oliver Neukum |
838022 |
if (IS_ERR(dwc->usb3_generic_phy)) {
|
|
Oliver Neukum |
838022 |
ret = PTR_ERR(dwc->usb3_generic_phy);
|
|
Oliver Neukum |
838022 |
- if (ret == -ENOSYS || ret == -ENODEV) {
|
|
Oliver Neukum |
838022 |
+ if (ret == -ENOSYS || ret == -ENODEV)
|
|
Oliver Neukum |
838022 |
dwc->usb3_generic_phy = NULL;
|
|
Oliver Neukum |
838022 |
- } else {
|
|
Oliver Neukum |
838022 |
+ else
|
|
Oliver Neukum |
838022 |
return dev_err_probe(dev, ret, "no usb3 phy configured\n");
|
|
Oliver Neukum |
838022 |
- }
|
|
Oliver Neukum |
838022 |
}
|
|
Oliver Neukum |
838022 |
|
|
Oliver Neukum |
838022 |
return 0;
|
|
Oliver Neukum |
838022 |
--
|
|
Oliver Neukum |
838022 |
2.40.1
|
|
Oliver Neukum |
838022 |
|