[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20241230083855.52482-1-xiehongyu1@kylinos.cn>
Date: Mon, 30 Dec 2024 16:38:55 +0800
From: xiehongyu1@...inos.cn
To: pawell@...ence.com
Cc: peter.chen@...nel.org,
rogerq@...nel.org,
frank.li@....com,
gregkh@...uxfoundation.org,
linux-usb@...r.kernel.org,
linux-kernel@...r.kernel.org,
Hongyu Xie <xiehongyu1@...inos.cn>
Subject: [PATCH] usb: cdns3: remove redundant if branch
From: Hongyu Xie <xiehongyu1@...inos.cn>
cdns->role_sw->dev->driver_data gets set in routines showing bellow,
cdns_init
sw_desc.driver_data = cdns;
cdns->role_sw = usb_role_switch_register(dev, &sw_desc);
dev_set_drvdata(&sw->dev, desc->driver_data);
In cdns_resume,
cdns->role = cdns_role_get(cdns->role_sw); //line redundant
struct cdns *cdns = usb_role_switch_get_drvdata(sw);
dev_get_drvdata(&sw->dev)
return dev->driver_data
return cdns->role;
"line redundant" equals to,
cdns->role = cdns->role;
So fix this if branch.
Fixes: 2cf2581cd229 ("usb: cdns3: add power lost support for system resume")
Signed-off-by: Hongyu Xie <xiehongyu1@...inos.cn>
---
drivers/usb/cdns3/core.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index 465e9267b49c..98980a23e1c2 100644
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -529,9 +529,7 @@ int cdns_resume(struct cdns *cdns)
int ret = 0;
if (cdns_power_is_lost(cdns)) {
- if (cdns->role_sw) {
- cdns->role = cdns_role_get(cdns->role_sw);
- } else {
+ if (!cdns->role_sw) {
real_role = cdns_hw_role_state_machine(cdns);
if (real_role != cdns->role) {
ret = cdns_hw_role_switch(cdns);
--
2.25.1
Powered by blists - more mailing lists