usb: xhci: remove 'retval' from xhci_pci_resume()

Epicurius · gregkh · commit dbb2c9229da2 · 2024-09-05T16:39:22.000+02:00
Remove unnecessary local 'retval' argument. Signed-off-by: Niklas Neronin <niklas.neronin@linux.intel.com> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Link: https://lore.kernel.org/r/20240905143300.1959279-10-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
@@ -786,7 +786,6 @@ static int xhci_pci_resume(struct usb_hcd *hcd, pm_message_t msg)
 {
 	struct xhci_hcd		*xhci = hcd_to_xhci(hcd);
 	struct pci_dev		*pdev = to_pci_dev(hcd->self.controller);
-	int			retval = 0;
 
 	reset_control_reset(xhci->reset);
 
@@ -817,8 +816,7 @@ static int xhci_pci_resume(struct usb_hcd *hcd, pm_message_t msg)
 	if (xhci->quirks & XHCI_PME_STUCK_QUIRK)
 		xhci_pme_quirk(hcd);
 
-	retval = xhci_resume(xhci, msg);
-	return retval;
+	return xhci_resume(xhci, msg);
 }
 
 static int xhci_pci_poweroff_late(struct usb_hcd *hcd, bool do_wakeup)

Original file line number	Diff line number	Diff line change
`@@ -786,7 +786,6 @@ static int xhci_pci_resume(struct usb_hcd *hcd, pm_message_t msg)`
`786`	`786`	`{`
`787`	`787`	`struct xhci_hcd *xhci = hcd_to_xhci(hcd);`
`788`	`788`	`struct pci_dev *pdev = to_pci_dev(hcd->self.controller);`
`789`		`- int retval = 0;`
`790`	`789`
`791`	`790`	`reset_control_reset(xhci->reset);`
`792`	`791`
`@@ -817,8 +816,7 @@ static int xhci_pci_resume(struct usb_hcd *hcd, pm_message_t msg)`
`817`	`816`	`if (xhci->quirks & XHCI_PME_STUCK_QUIRK)`
`818`	`817`	`xhci_pme_quirk(hcd);`
`819`	`818`
`820`		`- retval = xhci_resume(xhci, msg);`
`821`		`- return retval;`
	`819`	`+ return xhci_resume(xhci, msg);`
`822`	`820`	`}`
`823`	`821`
`824`	`822`	`static int xhci_pci_poweroff_late(struct usb_hcd *hcd, bool do_wakeup)`