35c35
< __FBSDID("$FreeBSD: head/sys/arm/econa/ehci_ebus.c 227849 2011-11-22 21:56:55Z hselasky $");
---
> __FBSDID("$FreeBSD: head/sys/arm/econa/ehci_ebus.c 228483 2011-12-14 00:28:54Z hselasky $");
78,80d77
< static device_shutdown_t ehci_ebus_shutdown;
< static device_suspend_t ehci_ebus_suspend;
< static device_resume_t ehci_ebus_resume;
82d78
<
89,127d84
< ehci_ebus_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_ebus_resume(device_t self)
< {
< ehci_softc_t *sc = device_get_softc(self);
<
< ehci_resume(sc);
<
< bus_generic_resume(self);
<
< return (0);
< }
<
< static int
< ehci_ebus_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
280,282c237,239
< DEVMETHOD(device_suspend, ehci_ebus_suspend),
< DEVMETHOD(device_resume, ehci_ebus_resume),
< DEVMETHOD(device_shutdown, ehci_ebus_shutdown),
---
> DEVMETHOD(device_suspend, bus_generic_suspend),
> DEVMETHOD(device_resume, bus_generic_resume),
> DEVMETHOD(device_shutdown, bus_generic_shutdown),
288,290c245,247
< "ehci",
< ehci_methods,
< sizeof(ehci_softc_t),
---
> .name = "ehci",
> .methods = ehci_methods,
> .size = sizeof(ehci_softc_t),