30c30
< __FBSDID("$FreeBSD: head/sys/dev/usb/controller/ehci_ixp4xx.c 227849 2011-11-22 21:56:55Z hselasky $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb/controller/ehci_ixp4xx.c 228483 2011-12-14 00:28:54Z hselasky $");
81,83d80
< static device_shutdown_t ehci_ixp_shutdown;
< static device_suspend_t ehci_ixp_suspend;
< static device_resume_t ehci_ixp_resume;
93,131d89
< ehci_ixp_suspend(device_t self)
< {
< ehci_softc_t *sc = device_get_softc(self);
< int err;
<
< err = bus_generic_suspend(self);
< if (err)
< return (err);
< ehci_suspend(sc);
< return (0);
< }
<
< static int
< ehci_ixp_resume(device_t self)
< {
< ehci_softc_t *sc = device_get_softc(self);
<
< ehci_resume(sc);
<
< bus_generic_resume(self);
<
< return (0);
< }
<
< static int
< ehci_ixp_shutdown(device_t self)
< {
< ehci_softc_t *sc = device_get_softc(self);
< int err;
<
< err = bus_generic_shutdown(self);
< if (err)
< return (err);
< ehci_shutdown(sc);
<
< return (0);
< }
<
< static int
338,340c296,298
< DEVMETHOD(device_suspend, ehci_ixp_suspend),
< DEVMETHOD(device_resume, ehci_ixp_resume),
< DEVMETHOD(device_shutdown, ehci_ixp_shutdown),
---
> DEVMETHOD(device_suspend, bus_generic_suspend),
> DEVMETHOD(device_resume, bus_generic_resume),
> DEVMETHOD(device_shutdown, bus_generic_shutdown),