Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74db22cb authored by Ramneek Mehresh's avatar Ramneek Mehresh Committed by Greg Kroah-Hartman
Browse files

drivers:usb:fsl: Fix compilation error for fsl ehci drv 



Fix compilation error in fsl ehci drv because ehci_reset()
and ehci_adjust_port_wakeup_flags() were not exported, and
are used when PM is enabled

Signed-off-by: default avatarRamneek Mehresh <ramneek.mehresh@freescale.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c5d496ad

drivers/usb/host/ehci-hcd.c

+2 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static void tdi_reset (struct ehci_hcd *ehci) 
 * Reset a non-running (STS_HALT == 1) controller.

 * Must be called with interrupts enabled and the lock not held.

 */

static int ehci_reset (struct ehci_hcd *ehci)

int ehci_reset(struct ehci_hcd *ehci)

{

	int	retval;

	u32	command = ehci_readl(ehci, &ehci->regs->command);
@@ -275,6 +275,7 @@ static int ehci_reset (struct ehci_hcd *ehci) 
			ehci->resuming_ports = 0;

	return retval;

}

EXPORT_SYMBOL_GPL(ehci_reset);



/*

 * Idle the controller (turn off the schedules).

drivers/usb/host/ehci-hub.c

+2 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static int ehci_port_change(struct ehci_hcd *ehci) 
	return 0;

}



static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,

void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,

		bool suspending, bool do_wakeup)

{

	int		port;
@@ -220,6 +220,7 @@ static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci, 


	spin_unlock_irq(&ehci->lock);

}

EXPORT_SYMBOL_GPL(ehci_adjust_port_wakeup_flags);



static int ehci_bus_suspend (struct usb_hcd *hcd)

{

drivers/usb/host/ehci.h

+3 −0
Original line number Diff line number Diff line
@@ -868,10 +868,13 @@ extern void ehci_init_driver(struct hc_driver *drv, 
extern int	ehci_setup(struct usb_hcd *hcd);

extern int	ehci_handshake(struct ehci_hcd *ehci, void __iomem *ptr,

				u32 mask, u32 done, int usec);

extern int	ehci_reset(struct ehci_hcd *ehci);



#ifdef CONFIG_PM

extern int	ehci_suspend(struct usb_hcd *hcd, bool do_wakeup);

extern int	ehci_resume(struct usb_hcd *hcd, bool force_reset);

extern void	ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,

			bool suspending, bool do_wakeup);

#endif	/* CONFIG_PM */



extern int	ehci_hub_control(struct usb_hcd	*hcd, u16 typeReq, u16 wValue,