30c30
< __FBSDID("$FreeBSD: head/sys/mips/atheros/ar71xx_ehci.c 227849 2011-11-22 21:56:55Z hselasky $");
---
> __FBSDID("$FreeBSD: head/sys/mips/atheros/ar71xx_ehci.c 228483 2011-12-14 00:28:54Z hselasky $");
68,70d67
< static device_shutdown_t ar71xx_ehci_shutdown;
< static device_suspend_t ar71xx_ehci_suspend;
< static device_resume_t ar71xx_ehci_resume;
76,114d72
< ar71xx_ehci_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
< ar71xx_ehci_resume(device_t self)
< {
< ehci_softc_t *sc = device_get_softc(self);
<
< ehci_resume(sc);
<
< bus_generic_resume(self);
<
< return (0);
< }
<
< static int
< ar71xx_ehci_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
283,285c241,243
< DEVMETHOD(device_suspend, ar71xx_ehci_suspend),
< DEVMETHOD(device_resume, ar71xx_ehci_resume),
< DEVMETHOD(device_shutdown, ar71xx_ehci_shutdown),
---
> DEVMETHOD(device_suspend, bus_generic_suspend),
> DEVMETHOD(device_resume, bus_generic_resume),
> DEVMETHOD(device_shutdown, bus_generic_shutdown),
291,293c249,251
< "ehci",
< ehci_methods,
< sizeof(struct ar71xx_ehci_softc),
---
> .name = "ehci",
> .methods = ehci_methods,
> .size = sizeof(struct ar71xx_ehci_softc),