Skip to contentSkip to conversation

usb: renesas-xhci: Cleanups

PATCH New Moritz Fischer 1 participant 3 messages Jul 18, 2021

Subsystems (2)
USB USB xHCI driver
lore
Share & tools
lore

Moritz Fischer

author
#0 lore raw

cover usb: renesas-xhci: Cleanups

While looking through the driver code I ran into two minor things.

The first one is a simple if (err == 0) -> if (!err) change.

The second one removes an empty(?) function that seems to have been around since the beginning (and always has been empty).

Moritz Fischer (2):
usb: xhci-renesas: Minor coding style cleanup
usb: renesas-xhci: Remove renesas_xhci_pci_exit()

 drivers/usb/host/xhci-pci-renesas.c | 7 +------
 drivers/usb/host/xhci-pci.c         | 2 --
 drivers/usb/host/xhci-pci.h         | 3 ---
 3 files changed, 1 insertion(+), 11 deletions(-)
Signature · 1 line
2.32.0
author
#1 lore raw

PATCH 1/2 usb: xhci-renesas: Minor coding style cleanup

Change an explicit err == 0 to !err. No functional change.

Cc Mathias Nyman <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Vinod Koul <[email protected]>
Signed-off-by Moritz Fischer <[email protected]>
---
 drivers/usb/host/xhci-pci-renesas.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-pci-renesas.c +1 -1
index 1da647961c25..327f6a6d5672 100644
@@ -595,7 +595,7 @@ int renesas_xhci_check_request_fw(struct pci_dev *pdev,
 
 	err = renesas_fw_check_running(pdev);
 	/* Continue ahead, if the firmware is already running. */
-	if (err == 0)
+	if (!err)
 		return 0;
 
 	if (err != 1)
Signature · 1 line
2.32.0
author
#2 lore raw

PATCH 2/2 usb: renesas-xhci: Remove renesas_xhci_pci_exit()

In reply to Moritz Fischer

Remove empty function renesas_xhci_pci_exit() that does not actually do anything.

Cc Mathias Nyman <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Vinod Koul <[email protected]>
Signed-off-by Moritz Fischer <[email protected]>
---
 drivers/usb/host/xhci-pci-renesas.c | 5 -----
 drivers/usb/host/xhci-pci.c         | 2 --
 drivers/usb/host/xhci-pci.h         | 3 ---
 3 files changed, 10 deletions(-)
drivers/usb/host/xhci-pci-renesas.c +0 -5
index 327f6a6d5672..1ebacc42a552 100644
@@ -620,9 +620,4 @@ int renesas_xhci_check_request_fw(struct pci_dev *pdev,
 }
 EXPORT_SYMBOL_GPL(renesas_xhci_check_request_fw);
 
-void renesas_xhci_pci_exit(struct pci_dev *dev)
-{
-}
-EXPORT_SYMBOL_GPL(renesas_xhci_pci_exit);
-
 MODULE_LICENSE("GPL v2");
drivers/usb/host/xhci-pci.c +0 -2
index 18c2bbddf080..4456ba338b74 100644
@@ -449,8 +449,6 @@ static void xhci_pci_remove(struct pci_dev *dev)
 	struct xhci_hcd *xhci;
 
 	xhci = hcd_to_xhci(pci_get_drvdata(dev));
-	if (xhci->quirks & XHCI_RENESAS_FW_QUIRK)
-		renesas_xhci_pci_exit(dev);
 
 	xhci->xhc_state |= XHCI_STATE_REMOVING;
drivers/usb/host/xhci-pci.h +0 -3
index acd7cf0a1706..cb9a8f331a44 100644
@@ -7,7 +7,6 @@
 #if IS_ENABLED(CONFIG_USB_XHCI_PCI_RENESAS)
 int renesas_xhci_check_request_fw(struct pci_dev *dev,
 				  const struct pci_device_id *id);
-void renesas_xhci_pci_exit(struct pci_dev *dev);
 
 #else
 static int renesas_xhci_check_request_fw(struct pci_dev *dev,

@@ -16,8 +15,6 @@ static int renesas_xhci_check_request_fw(struct pci_dev *dev,
 	return 0;
 }
 
-static void renesas_xhci_pci_exit(struct pci_dev *dev) { };
-
 #endif
 
 struct xhci_driver_data {
Signature · 1 line
2.32.0