32c32
< __FBSDID("$FreeBSD: head/sys/dev/usb/controller/ohci_pci.c 227849 2011-11-22 21:56:55Z hselasky $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb/controller/ohci_pci.c 228483 2011-12-14 00:28:54Z hselasky $");
76a77
> #include "usb_if.h"
95,96c96
< static device_suspend_t ohci_pci_suspend;
< static device_resume_t ohci_pci_resume;
---
> static usb_take_controller_t ohci_pci_take_controller;
99c99
< ohci_pci_suspend(device_t self)
---
> ohci_pci_take_controller(device_t self)
101,102c101,102
< ohci_softc_t *sc = device_get_softc(self);
< int err;
---
> uint32_t reg;
> uint32_t int_line;
104,117d103
< err = bus_generic_suspend(self);
< if (err) {
< return (err);
< }
< ohci_suspend(sc);
< return (0);
< }
<
< static int
< ohci_pci_resume(device_t self)
< {
< ohci_softc_t *sc = device_get_softc(self);
< uint32_t reg, int_line;
<
127,129d112
< ohci_resume(sc);
<
< bus_generic_resume(self);
384,394c367,375
< static driver_t ohci_driver =
< {
< .name = "ohci",
< .methods = (device_method_t[]){
< /* device interface */
< DEVMETHOD(device_probe, ohci_pci_probe),
< DEVMETHOD(device_attach, ohci_pci_attach),
< DEVMETHOD(device_detach, ohci_pci_detach),
< DEVMETHOD(device_suspend, ohci_pci_suspend),
< DEVMETHOD(device_resume, ohci_pci_resume),
< DEVMETHOD(device_shutdown, bus_generic_shutdown),
---
> static device_method_t ohci_pci_methods[] = {
> /* Device interface */
> DEVMETHOD(device_probe, ohci_pci_probe),
> DEVMETHOD(device_attach, ohci_pci_attach),
> DEVMETHOD(device_detach, ohci_pci_detach),
> DEVMETHOD(device_suspend, bus_generic_suspend),
> DEVMETHOD(device_resume, bus_generic_resume),
> DEVMETHOD(device_shutdown, bus_generic_shutdown),
> DEVMETHOD(usb_take_controller, ohci_pci_take_controller),
396,397c377,382
< DEVMETHOD_END
< },
---
> DEVMETHOD_END
> };
>
> static driver_t ohci_driver = {
> .name = "ohci",
> .methods = ohci_pci_methods,