From owner-svn-src-head@FreeBSD.ORG Fri Jan 16 06:19:25 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 172C7205; Fri, 16 Jan 2015 06:19:25 +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 DE658D91; Fri, 16 Jan 2015 06:19:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0G6JOCZ060438; Fri, 16 Jan 2015 06:19:24 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0G6JOZl060437; Fri, 16 Jan 2015 06:19:24 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201501160619.t0G6JOZl060437@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 16 Jan 2015 06:19:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r277233 - head/sys/dev/pccbb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jan 2015 06:19:25 -0000 Author: imp Date: Fri Jan 16 06:19:24 2015 New Revision: 277233 URL: https://svnweb.freebsd.org/changeset/base/277233 Log: Suspend and resume were the only two functions not to follow the brdev convention here, so fix that. Modified: head/sys/dev/pccbb/pccbb.c Modified: head/sys/dev/pccbb/pccbb.c ============================================================================== --- head/sys/dev/pccbb/pccbb.c Fri Jan 16 06:19:08 2015 (r277232) +++ head/sys/dev/pccbb/pccbb.c Fri Jan 16 06:19:24 2015 (r277233) @@ -1563,12 +1563,12 @@ cbb_write_ivar(device_t brdev, device_t } int -cbb_suspend(device_t self) +cbb_suspend(device_t brdev) { int error = 0; - struct cbb_softc *sc = device_get_softc(self); + struct cbb_softc *sc = device_get_softc(brdev); - error = bus_generic_suspend(self); + error = bus_generic_suspend(brdev); if (error != 0) return (error); cbb_set(sc, CBB_SOCKET_MASK, 0); /* Quiet hardware */ @@ -1577,10 +1577,10 @@ cbb_suspend(device_t self) } int -cbb_resume(device_t self) +cbb_resume(device_t brdev) { int error = 0; - struct cbb_softc *sc = (struct cbb_softc *)device_get_softc(self); + struct cbb_softc *sc = (struct cbb_softc *)device_get_softc(brdev); uint32_t tmp; /* @@ -1596,8 +1596,8 @@ cbb_resume(device_t self) * code that would be difficult to transition into the PCI * layer. chipinit was several years of trial and error to write. */ - pci_write_config(self, CBBR_SOCKBASE, rman_get_start(sc->base_res), 4); - DEVPRINTF((self, "PCI Memory allocated: %08lx\n", + pci_write_config(brdev, CBBR_SOCKBASE, rman_get_start(sc->base_res), 4); + DEVPRINTF((brdev, "PCI Memory allocated: %08lx\n", rman_get_start(sc->base_res))); sc->chipinit(sc); @@ -1612,7 +1612,7 @@ cbb_resume(device_t self) /* Signal the thread to wakeup. */ wakeup(&sc->intrhand); - error = bus_generic_resume(self); + error = bus_generic_resume(brdev); return (error); }