usb: cdns3: call cdns_power_is_lost() only once in cdns_resume()

tleb · gregkh · commit 17c6526b333c · 2025-03-14T09:18:02.000+01:00
cdns_power_is_lost() does a register read. Call it only once rather than twice. Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com> Link: https://lore.kernel.org/r/20250205-s2r-cdns-v7-4-13658a271c3c@bootlin.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
@@ -524,11 +524,12 @@ EXPORT_SYMBOL_GPL(cdns_suspend);
 
 int cdns_resume(struct cdns *cdns)
 {
+	bool power_lost = cdns_power_is_lost(cdns);
 	enum usb_role real_role;
 	bool role_changed = false;
 	int ret = 0;
 
-	if (cdns_power_is_lost(cdns)) {
+	if (power_lost) {
 		if (!cdns->role_sw) {
 			real_role = cdns_hw_role_state_machine(cdns);
 			if (real_role != cdns->role) {
@@ -551,7 +552,7 @@ int cdns_resume(struct cdns *cdns)
 	}
 
 	if (cdns->roles[cdns->role]->resume)
-		cdns->roles[cdns->role]->resume(cdns, cdns_power_is_lost(cdns));
+		cdns->roles[cdns->role]->resume(cdns, power_lost);
 
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -524,11 +524,12 @@ EXPORT_SYMBOL_GPL(cdns_suspend);`
`524`	`524`
`525`	`525`	`int cdns_resume(struct cdns *cdns)`
`526`	`526`	`{`
	`527`	`+ bool power_lost = cdns_power_is_lost(cdns);`
`527`	`528`	`enum usb_role real_role;`
`528`	`529`	`bool role_changed = false;`
`529`	`530`	`int ret = 0;`
`530`	`531`
`531`		`- if (cdns_power_is_lost(cdns)) {`
	`532`	`+ if (power_lost) {`
`532`	`533`	`if (!cdns->role_sw) {`
`533`	`534`	`real_role = cdns_hw_role_state_machine(cdns);`
`534`	`535`	`if (real_role != cdns->role) {`
`@@ -551,7 +552,7 @@ int cdns_resume(struct cdns *cdns)`
`551`	`552`	`}`
`552`	`553`
`553`	`554`	`if (cdns->roles[cdns->role]->resume)`
`554`		`- cdns->roles[cdns->role]->resume(cdns, cdns_power_is_lost(cdns));`
	`555`	`+ cdns->roles[cdns->role]->resume(cdns, power_lost);`
`555`	`556`
`556`	`557`	`return 0;`
`557`	`558`	`}`