瀏覽代碼

USB: ohci-pnx4008 build fixes

The OHCI bus glue for the Philips PNX chips is missing a few calls.

 - Bus suspend/resume were wrongly omitted in the original submission.
 - Two new calls were added since that glue was submitted:
     * Root hub irq enable call
     * Shutdown hook for usbcore

Plus usb_bus.hcpriv has now been removed from usbcore.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
David Brownell 18 年之前
父節點
當前提交
8442ae00d4
共有 1 個文件被更改,包括 6 次插入3 次删除
  1. 6 3
      drivers/usb/host/ohci-pnx4008.c

+ 6 - 3
drivers/usb/host/ohci-pnx4008.c

@@ -262,6 +262,7 @@ static const struct hc_driver ohci_pnx4008_hc_driver = {
 	 */
 	 */
 	.start = ohci_pnx4008_start,
 	.start = ohci_pnx4008_start,
 	.stop = ohci_stop,
 	.stop = ohci_stop,
+	.shutdown = ohci_shutdown,
 
 
 	/*
 	/*
 	 * managing i/o requests and associated device resources
 	 * managing i/o requests and associated device resources
@@ -280,7 +281,11 @@ static const struct hc_driver ohci_pnx4008_hc_driver = {
 	 */
 	 */
 	.hub_status_data = ohci_hub_status_data,
 	.hub_status_data = ohci_hub_status_data,
 	.hub_control = ohci_hub_control,
 	.hub_control = ohci_hub_control,
-
+	.hub_irq_enable = ohci_rhsc_enable,
+#ifdef	CONFIG_PM
+	.bus_suspend = ohci_bus_suspend,
+	.bus_resume = ohci_bus_resume,
+#endif
 	.start_port_reset = ohci_start_port_reset,
 	.start_port_reset = ohci_start_port_reset,
 };
 };
 
 
@@ -410,8 +415,6 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev)
 		goto out4;
 		goto out4;
 	}
 	}
 
 
-	hcd->self.hcpriv = (void *)hcd;
-
 	pnx4008_start_hc();
 	pnx4008_start_hc();
 	platform_set_drvdata(pdev, hcd);
 	platform_set_drvdata(pdev, hcd);
 	ohci = hcd_to_ohci(hcd);
 	ohci = hcd_to_ohci(hcd);