USB: Hook start_hnp into ohci struct
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
1133cd8adf
commit
e8b24450a6
@@ -579,8 +579,6 @@ static int ohci_start_port_reset (struct usb_hcd *hcd, unsigned port)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void start_hnp(struct ohci_hcd *ohci);
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#define ohci_start_port_reset NULL
|
#define ohci_start_port_reset NULL
|
||||||
@@ -767,7 +765,7 @@ static int ohci_hub_control (
|
|||||||
#ifdef CONFIG_USB_OTG
|
#ifdef CONFIG_USB_OTG
|
||||||
if (hcd->self.otg_port == (wIndex + 1)
|
if (hcd->self.otg_port == (wIndex + 1)
|
||||||
&& hcd->self.b_hnp_enable)
|
&& hcd->self.b_hnp_enable)
|
||||||
start_hnp(ohci);
|
ohci->start_hnp(ohci);
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
ohci_writel (ohci, RH_PS_PSS,
|
ohci_writel (ohci, RH_PS_PSS,
|
||||||
|
@@ -225,6 +225,7 @@ static int ohci_omap_init(struct usb_hcd *hcd)
|
|||||||
dev_err(hcd->self.controller, "can't find transceiver\n");
|
dev_err(hcd->self.controller, "can't find transceiver\n");
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
ohci->start_hnp = start_hnp;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -371,6 +371,7 @@ struct ohci_hcd {
|
|||||||
* other external transceivers should be software-transparent
|
* other external transceivers should be software-transparent
|
||||||
*/
|
*/
|
||||||
struct otg_transceiver *transceiver;
|
struct otg_transceiver *transceiver;
|
||||||
|
void (*start_hnp)(struct ohci_hcd *ohci);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* memory management for queue data structures
|
* memory management for queue data structures
|
||||||
|
Reference in New Issue
Block a user