From owner-p4-projects@FreeBSD.ORG  Thu Oct 30 11:13:02 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 387BA16A4D1; Thu, 30 Oct 2003 11:13:02 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F2E5116A4CE
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 11:13:01 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 36B4B43FBF
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 11:13:01 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UJD0XJ059338
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 11:13:00 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UJD0JL059335
	for perforce@freebsd.org; Thu, 30 Oct 2003 11:13:00 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Thu, 30 Oct 2003 11:13:00 -0800 (PST)
Message-Id: <200310301913.h9UJD0JL059335@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 40855 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Oct 2003 19:13:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=40855

Change 40855 by jhb@jhb_laptop on 2003/10/30 11:12:34

	Fix ACPI and sparc64 OFW PCI bus drivers to use PCI
	       suspend/resume functions.

Affected files ...

.. //depot/projects/power/sys/dev/acpica/acpi_pci.c#4 edit
.. //depot/projects/power/sys/sparc64/pci/ofw_pcibus.c#2 edit

Differences ...

==== //depot/projects/power/sys/dev/acpica/acpi_pci.c#4 (text+ko) ====

@@ -75,7 +75,7 @@
 	DEVMETHOD(device_probe,		acpi_pci_probe),
 	DEVMETHOD(device_attach,	acpi_pci_attach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	DEVMETHOD(device_suspend,	bus_generic_suspend),
+	DEVMETHOD(device_suspend,	pci_suspend),
 	DEVMETHOD(device_resume,	pci_resume),
 
 	/* Bus interface */

==== //depot/projects/power/sys/sparc64/pci/ofw_pcibus.c#2 (text+ko) ====

@@ -69,8 +69,8 @@
 	DEVMETHOD(device_probe,		ofw_pcibus_probe),
 	DEVMETHOD(device_attach,	ofw_pcibus_attach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	DEVMETHOD(device_suspend,	bus_generic_suspend),
-	DEVMETHOD(device_resume,	bus_generic_resume),
+	DEVMETHOD(device_suspend,	pci_suspend),
+	DEVMETHOD(device_resume,	pci_resume),
 
 	/* Bus interface */
 	DEVMETHOD(bus_print_child,	pci_print_child),