From owner-svn-src-projects@FreeBSD.ORG Sat Jun 7 05:05:59 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1A4C13A1; Sat, 7 Jun 2014 05:05:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 07D642AAE; Sat, 7 Jun 2014 05:05:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5755whP090098; Sat, 7 Jun 2014 05:05:58 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5755wCW090097; Sat, 7 Jun 2014 05:05:58 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201406070505.s5755wCW090097@svn.freebsd.org> From: Justin Hibbits Date: Sat, 7 Jun 2014 05:05:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r267205 - projects/pmac_pmu/sys/dev/pci X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2014 05:05:59 -0000 Author: jhibbits Date: Sat Jun 7 05:05:58 2014 New Revision: 267205 URL: http://svnweb.freebsd.org/changeset/base/267205 Log: Use bus_generic_suspend_child/resume_child instead of directly using DEVICE_SUSPEND_CHILD/DEVICE_RESUME_CHILD, so that extra bookkeeping can take place. Modified: projects/pmac_pmu/sys/dev/pci/pci.c Modified: projects/pmac_pmu/sys/dev/pci/pci.c ============================================================================== --- projects/pmac_pmu/sys/dev/pci/pci.c Sat Jun 7 04:55:19 2014 (r267204) +++ projects/pmac_pmu/sys/dev/pci/pci.c Sat Jun 7 05:05:58 2014 (r267205) @@ -3655,7 +3655,7 @@ pci_suspend_child(device_t dev, device_t dinfo = device_get_ivars(child); pci_cfg_save(child, dinfo, 0); - error = DEVICE_SUSPEND(child); + error = bus_generic_suspend_child(dev, child); if (error) return (error); @@ -3674,7 +3674,7 @@ pci_resume_child(device_t dev, device_t if (pci_do_power_resume) pci_set_power_child(dev, child, PCI_POWERSTATE_D0); - error = DEVICE_RESUME(child); + error = bus_generic_resume_child(dev, child); dinfo = device_get_ivars(child); pci_cfg_restore(child, dinfo);