From owner-svn-src-projects@FreeBSD.ORG Sun Jan 19 07:44:15 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E073DA00; Sun, 19 Jan 2014 07:44:14 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C1A4B1716; Sun, 19 Jan 2014 07:44:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0J7iEOR085194; Sun, 19 Jan 2014 07:44:14 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0J7iE24085192; Sun, 19 Jan 2014 07:44:14 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201401190744.s0J7iE24085192@svn.freebsd.org> From: Justin Hibbits Date: Sun, 19 Jan 2014 07:44:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260877 - projects/pmac_pmu/sys/powerpc/powermac 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.17 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: Sun, 19 Jan 2014 07:44:15 -0000 Author: jhibbits Date: Sun Jan 19 07:44:14 2014 New Revision: 260877 URL: http://svnweb.freebsd.org/changeset/base/260877 Log: With the new bus suspend/resume, the buses don't need to be explicitly suspended and resumed, so remove the calls. Modified: projects/pmac_pmu/sys/powerpc/powermac/macio.c projects/pmac_pmu/sys/powerpc/powermac/uninorth.c Modified: projects/pmac_pmu/sys/powerpc/powermac/macio.c ============================================================================== --- projects/pmac_pmu/sys/powerpc/powermac/macio.c Sun Jan 19 07:43:02 2014 (r260876) +++ projects/pmac_pmu/sys/powerpc/powermac/macio.c Sun Jan 19 07:44:14 2014 (r260877) @@ -665,18 +665,9 @@ macio_enable_wireless(device_t dev, bool static int macio_suspend(device_t dev) { - int error; uint32_t temp; struct macio_softc *sc = device_get_softc(dev); - error = bus_generic_suspend(dev); - - if (error) - return (error); - - if (bus_current_pass != BUS_PASS_BUS) { - return (EAGAIN); - } powerpc_sync(); sc->saved_fcrs[0] = bus_read_4(sc->sc_memr, KEYLARGO_FCR0); @@ -745,20 +736,18 @@ static int macio_resume(device_t dev) { struct macio_softc *sc = device_get_softc(dev); - if (bus_current_pass == BUS_PASS_BUS) { - if (sc->sc_devid == 0x22) - bus_write_4(sc->sc_memr, KEYLARGO_MEDIABAY, sc->saved_mbcr); - - bus_write_4(sc->sc_memr, KEYLARGO_FCR0, sc->saved_fcrs[0]); - bus_write_4(sc->sc_memr, KEYLARGO_FCR1, sc->saved_fcrs[1]); - bus_write_4(sc->sc_memr, KEYLARGO_FCR2, sc->saved_fcrs[2]); - bus_write_4(sc->sc_memr, KEYLARGO_FCR3, sc->saved_fcrs[3]); - bus_write_4(sc->sc_memr, KEYLARGO_FCR4, sc->saved_fcrs[4]); - bus_write_4(sc->sc_memr, KEYLARGO_FCR5, sc->saved_fcrs[5]); - } + if (sc->sc_devid == 0x22) + bus_write_4(sc->sc_memr, KEYLARGO_MEDIABAY, sc->saved_mbcr); + + bus_write_4(sc->sc_memr, KEYLARGO_FCR0, sc->saved_fcrs[0]); + bus_write_4(sc->sc_memr, KEYLARGO_FCR1, sc->saved_fcrs[1]); + bus_write_4(sc->sc_memr, KEYLARGO_FCR2, sc->saved_fcrs[2]); + bus_write_4(sc->sc_memr, KEYLARGO_FCR3, sc->saved_fcrs[3]); + bus_write_4(sc->sc_memr, KEYLARGO_FCR4, sc->saved_fcrs[4]); + bus_write_4(sc->sc_memr, KEYLARGO_FCR5, sc->saved_fcrs[5]); /* Let things settle. */ DELAY(1000); - return (bus_generic_resume(dev)); + return (0); } Modified: projects/pmac_pmu/sys/powerpc/powermac/uninorth.c ============================================================================== --- projects/pmac_pmu/sys/powerpc/powermac/uninorth.c Sun Jan 19 07:43:02 2014 (r260876) +++ projects/pmac_pmu/sys/powerpc/powermac/uninorth.c Sun Jan 19 07:44:14 2014 (r260877) @@ -649,15 +649,7 @@ unin_chip_suspend(device_t dev) { int error; - error = bus_generic_suspend(dev); - - if (error) - return (error); - - if (bus_current_pass == BUS_PASS_BUS) - error = unin_chip_sleep(dev, 0); - else - error = EAGAIN; + error = unin_chip_sleep(dev, 0); return (error); } @@ -666,10 +658,9 @@ static int unin_chip_resume(device_t dev) { - if (bus_current_pass == BUS_PASS_BUS) - unin_chip_wake(dev); + unin_chip_wake(dev); - return (bus_generic_resume(dev)); + return (0); } int