diff options
author | David Brownell <david-b@pacbell.net> | 2006-10-02 10:20:10 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-10-17 17:46:30 -0400 |
commit | 8442ae00d47dad690ac1105b426274433dc672f8 (patch) | |
tree | 629c48b66106bb16b069b54edcff52614381c880 /drivers | |
parent | 1a2ea1dfc4ee078841cd6406ebf6bf0c5a3d25e9 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/host/ohci-pnx4008.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c index 82cb22f002e7..2dbb77414905 100644 --- a/drivers/usb/host/ohci-pnx4008.c +++ b/drivers/usb/host/ohci-pnx4008.c | |||
@@ -262,6 +262,7 @@ static const struct hc_driver ohci_pnx4008_hc_driver = { | |||
262 | */ | 262 | */ |
263 | .start = ohci_pnx4008_start, | 263 | .start = ohci_pnx4008_start, |
264 | .stop = ohci_stop, | 264 | .stop = ohci_stop, |
265 | .shutdown = ohci_shutdown, | ||
265 | 266 | ||
266 | /* | 267 | /* |
267 | * managing i/o requests and associated device resources | 268 | * managing i/o requests and associated device resources |
@@ -280,7 +281,11 @@ static const struct hc_driver ohci_pnx4008_hc_driver = { | |||
280 | */ | 281 | */ |
281 | .hub_status_data = ohci_hub_status_data, | 282 | .hub_status_data = ohci_hub_status_data, |
282 | .hub_control = ohci_hub_control, | 283 | .hub_control = ohci_hub_control, |
283 | 284 | .hub_irq_enable = ohci_rhsc_enable, | |
285 | #ifdef CONFIG_PM | ||
286 | .bus_suspend = ohci_bus_suspend, | ||
287 | .bus_resume = ohci_bus_resume, | ||
288 | #endif | ||
284 | .start_port_reset = ohci_start_port_reset, | 289 | .start_port_reset = ohci_start_port_reset, |
285 | }; | 290 | }; |
286 | 291 | ||
@@ -410,8 +415,6 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev) | |||
410 | goto out4; | 415 | goto out4; |
411 | } | 416 | } |
412 | 417 | ||
413 | hcd->self.hcpriv = (void *)hcd; | ||
414 | |||
415 | pnx4008_start_hc(); | 418 | pnx4008_start_hc(); |
416 | platform_set_drvdata(pdev, hcd); | 419 | platform_set_drvdata(pdev, hcd); |
417 | ohci = hcd_to_ohci(hcd); | 420 | ohci = hcd_to_ohci(hcd); |