linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] usb: cdns3: adjust the partial logic of cdnsp_pci_remove
@ 2022-10-09  5:32 Dongliang Mu
  2022-10-09  6:53 ` Greg Kroah-Hartman
  0 siblings, 1 reply; 5+ messages in thread
From: Dongliang Mu @ 2022-10-09  5:32 UTC (permalink / raw)
  To: Pawel Laszczak, Greg Kroah-Hartman; +Cc: Dongliang Mu, linux-usb, linux-kernel

From: Dongliang Mu <mudongliangabcd@gmail.com>

In cdnsp_pci_remove, if pci_is_enabled returns true, it will
call cdns_remove; else it will call kfree. Then both control flow
goes to pci_dev_put.

Adjust this logic by modifying it to an if else.

Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
---
 drivers/usb/cdns3/cdnsp-pci.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/cdns3/cdnsp-pci.c b/drivers/usb/cdns3/cdnsp-pci.c
index fe8a114c586c..efd54ed918b9 100644
--- a/drivers/usb/cdns3/cdnsp-pci.c
+++ b/drivers/usb/cdns3/cdnsp-pci.c
@@ -192,14 +192,12 @@ static void cdnsp_pci_remove(struct pci_dev *pdev)
 	if (pci_dev_run_wake(pdev))
 		pm_runtime_get_noresume(&pdev->dev);
 
-	if (!pci_is_enabled(func)) {
+	if (pci_is_enabled(func)) {
+		cdns_remove(cdnsp);
+	} else {
 		kfree(cdnsp);
-		goto pci_put;
 	}
 
-	cdns_remove(cdnsp);
-
-pci_put:
 	pci_dev_put(func);
 }
 
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH] usb: cdns3: adjust the partial logic of cdnsp_pci_remove
@ 2022-10-09  7:23 Dongliang Mu
  2022-10-10  4:27 ` Pawel Laszczak
  0 siblings, 1 reply; 5+ messages in thread
From: Dongliang Mu @ 2022-10-09  7:23 UTC (permalink / raw)
  To: Pawel Laszczak, Greg Kroah-Hartman; +Cc: Dongliang Mu, linux-usb, linux-kernel

In cdnsp_pci_remove, if pci_is_enabled returns true, it will
call cdns_remove; else it will call kfree. Then both control flow
goes to pci_dev_put.

Adjust this logic by modifying it to an if else.

Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
---
 drivers/usb/cdns3/cdnsp-pci.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/cdns3/cdnsp-pci.c b/drivers/usb/cdns3/cdnsp-pci.c
index fe8a114c586c..efd54ed918b9 100644
--- a/drivers/usb/cdns3/cdnsp-pci.c
+++ b/drivers/usb/cdns3/cdnsp-pci.c
@@ -192,14 +192,12 @@ static void cdnsp_pci_remove(struct pci_dev *pdev)
 	if (pci_dev_run_wake(pdev))
 		pm_runtime_get_noresume(&pdev->dev);
 
-	if (!pci_is_enabled(func)) {
+	if (pci_is_enabled(func)) {
+		cdns_remove(cdnsp);
+	} else {
 		kfree(cdnsp);
-		goto pci_put;
 	}
 
-	cdns_remove(cdnsp);
-
-pci_put:
 	pci_dev_put(func);
 }
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-10-10  5:48 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-09  5:32 [PATCH] usb: cdns3: adjust the partial logic of cdnsp_pci_remove Dongliang Mu
2022-10-09  6:53 ` Greg Kroah-Hartman
2022-10-09  7:33   ` Dongliang Mu
2022-10-09  7:23 Dongliang Mu
2022-10-10  4:27 ` Pawel Laszczak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).