evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB: EHCI: Export the ehci_hub_control function

Browse source 
Platform drivers sometimes need to perform specific handling of hub
control requests. Make this possible by exporting the ehci_hub_control()
function which can then be called from a custom hub control handler in
the default case.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Laurent Pinchart 2014-04-16 18:00:10 +02:00 • committed by Greg Kroah-Hartman
parent 42b59eba71
commit 3776993908
3 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/usb/host/ehci-hub.c
View file

@ -33,15 +33,6 @@
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int ehci_hub_control(
struct usb_hcd *hcd,
u16 typeReq,
u16 wValue,
u16 wIndex,
char *buf,
u16 wLength
);
static int persist_enabled_on_companion(struct usb_device *udev, void *unused) static int persist_enabled_on_companion(struct usb_device *udev, void *unused)
{ {
return !udev->maxchild && udev->persist_enabled && return !udev->maxchild && udev->persist_enabled &&
@ -865,7 +856,7 @@ cleanup:
#endif /* CONFIG_USB_HCD_TEST_MODE */ #endif /* CONFIG_USB_HCD_TEST_MODE */
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static int ehci_hub_control ( int ehci_hub_control(
struct usb_hcd *hcd, struct usb_hcd *hcd,
u16 typeReq, u16 typeReq,
u16 wValue, u16 wValue,
@ -1285,6 +1276,7 @@ error_exit:
spin_unlock_irqrestore (&ehci->lock, flags); spin_unlock_irqrestore (&ehci->lock, flags);
return retval; return retval;
} }
EXPORT_SYMBOL_GPL(ehci_hub_control);
static void ehci_relinquish_port(struct usb_hcd *hcd, int portnum) static void ehci_relinquish_port(struct usb_hcd *hcd, int portnum)
{ {

8
drivers/usb/host/ehci-tegra.c
View file

@ -51,10 +51,6 @@ struct tegra_ehci_soc_config {
bool has_hostpc; bool has_hostpc;
}; };
static int (*orig_hub_control)(struct usb_hcd *hcd,
u16 typeReq, u16 wValue, u16 wIndex,
char *buf, u16 wLength);
struct tegra_ehci_hcd { struct tegra_ehci_hcd {
struct tegra_usb_phy *phy; struct tegra_usb_phy *phy;
struct clk *clk; struct clk *clk;
@ -236,7 +232,7 @@ static int tegra_ehci_hub_control(
spin_unlock_irqrestore(&ehci->lock, flags); spin_unlock_irqrestore(&ehci->lock, flags);
/* Handle the hub control events here */ /* Handle the hub control events here */
return orig_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength); return ehci_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength);
done: done:
spin_unlock_irqrestore(&ehci->lock, flags); spin_unlock_irqrestore(&ehci->lock, flags);
@ -554,8 +550,6 @@ static int __init ehci_tegra_init(void)
* too easy. * too easy.
*/ */
orig_hub_control = tegra_ehci_hc_driver.hub_control;
tegra_ehci_hc_driver.map_urb_for_dma = tegra_ehci_map_urb_for_dma; tegra_ehci_hc_driver.map_urb_for_dma = tegra_ehci_map_urb_for_dma;
tegra_ehci_hc_driver.unmap_urb_for_dma = tegra_ehci_unmap_urb_for_dma; tegra_ehci_hc_driver.unmap_urb_for_dma = tegra_ehci_unmap_urb_for_dma;
tegra_ehci_hc_driver.hub_control = tegra_ehci_hub_control; tegra_ehci_hc_driver.hub_control = tegra_ehci_hub_control;

3
drivers/usb/host/ehci.h
View file

@ -872,4 +872,7 @@ extern int ehci_suspend(struct usb_hcd *hcd, bool do_wakeup);
extern int ehci_resume(struct usb_hcd *hcd, bool hibernated); extern int ehci_resume(struct usb_hcd *hcd, bool hibernated);
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
extern int ehci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
u16 wIndex, char *buf, u16 wLength);
#endif /* __LINUX_EHCI_HCD_H */ #endif /* __LINUX_EHCI_HCD_H */