27c27
< __FBSDID("$FreeBSD: head/sys/dev/usb/controller/xhci_pci.c 227849 2011-11-22 21:56:55Z hselasky $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb/controller/xhci_pci.c 228483 2011-12-14 00:28:54Z hselasky $");
60a61
> #include "usb_if.h"
65,68c66
< static device_suspend_t xhci_pci_suspend;
< static device_resume_t xhci_pci_resume;
< static device_shutdown_t xhci_pci_shutdown;
< static void xhci_pci_takecontroller(device_t);
---
> static usb_take_controller_t xhci_pci_take_controller;
75,77c73,76
< DEVMETHOD(device_suspend, xhci_pci_suspend),
< DEVMETHOD(device_resume, xhci_pci_resume),
< DEVMETHOD(device_shutdown, xhci_pci_shutdown),
---
> DEVMETHOD(device_suspend, bus_generic_suspend),
> DEVMETHOD(device_resume, bus_generic_resume),
> DEVMETHOD(device_shutdown, bus_generic_shutdown),
> DEVMETHOD(usb_take_controller, xhci_pci_take_controller),
93,97d91
< static int
< xhci_pci_suspend(device_t self)
< {
< struct xhci_softc *sc = device_get_softc(self);
< int err;
99,132d92
< err = bus_generic_suspend(self);
< if (err)
< return (err);
< xhci_suspend(sc);
< return (0);
< }
<
< static int
< xhci_pci_resume(device_t self)
< {
< struct xhci_softc *sc = device_get_softc(self);
<
< xhci_pci_takecontroller(self);
< xhci_resume(sc);
<
< bus_generic_resume(self);
<
< return (0);
< }
<
< static int
< xhci_pci_shutdown(device_t self)
< {
< struct xhci_softc *sc = device_get_softc(self);
< int err;
<
< err = bus_generic_shutdown(self);
< if (err)
< return (err);
< xhci_shutdown(sc);
<
< return (0);
< }
<
212c172
< xhci_pci_takecontroller(self);
---
> xhci_pci_take_controller(self);
271,272c231,232
< static void
< xhci_pci_takecontroller(device_t self)
---
> static int
> xhci_pci_take_controller(device_t self)
314a275
> return (0);