diff options
| author | jhb <jhb@FreeBSD.org> | 2010-08-05 16:10:12 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2010-08-05 16:10:12 +0000 |
| commit | 5cf4f672749c39f6ac26eacc0402556c2b44f647 (patch) | |
| tree | 15eb9a859994788488de0f649b41fdc6704a3806 /sys/dev/acpica/acpi_pcib_acpi.c | |
| parent | d1b61616fa6d6851624ea2056a25e8aea473e388 (diff) | |
| download | FreeBSD-src-5cf4f672749c39f6ac26eacc0402556c2b44f647.zip FreeBSD-src-5cf4f672749c39f6ac26eacc0402556c2b44f647.tar.gz | |
- Retire acpi_pcib_resume(). It is has just been an alias for
bus_generic_resume() since the pci_link(4) driver was added.
- Change the ACPI PCI-PCI bridge driver to inherit most of its methods
from the generic PCI-PCI bridge driver. In particular, this will now
restore PCI config registers for ACPI PCI-PCI bridges.
Tested by: Oleg Sharoyko osharoiko of gmail
Diffstat (limited to 'sys/dev/acpica/acpi_pcib_acpi.c')
| -rw-r--r-- | sys/dev/acpica/acpi_pcib_acpi.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index b20fc74..7275330 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -65,7 +65,6 @@ struct acpi_hpcib_softc { static int acpi_pcib_acpi_probe(device_t bus); static int acpi_pcib_acpi_attach(device_t bus); -static int acpi_pcib_acpi_resume(device_t bus); static int acpi_pcib_read_ivar(device_t dev, device_t child, int which, uintptr_t *result); static int acpi_pcib_write_ivar(device_t dev, device_t child, @@ -94,7 +93,7 @@ static device_method_t acpi_pcib_acpi_methods[] = { DEVMETHOD(device_attach, acpi_pcib_acpi_attach), DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, acpi_pcib_acpi_resume), + DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), @@ -257,13 +256,6 @@ acpi_pcib_acpi_attach(device_t dev) return (acpi_pcib_attach(dev, &sc->ap_prt, sc->ap_bus)); } -static int -acpi_pcib_acpi_resume(device_t dev) -{ - - return (acpi_pcib_resume(dev)); -} - /* * Support for standard PCI bridge ivars. */ |
