From owner-svn-src-all@freebsd.org Tue Sep 1 22:00:49 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8413D37D602; Tue, 1 Sep 2020 22:00:49 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Gn30Slz4Ztm; Tue, 1 Sep 2020 22:00:49 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4B8B020513; Tue, 1 Sep 2020 22:00:49 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M0nX0048696; Tue, 1 Sep 2020 22:00:49 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M0mmi048695; Tue, 1 Sep 2020 22:00:48 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012200.081M0mmi048695@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:00:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365180 - head/sys/dev/pccbb X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/pccbb X-SVN-Commit-Revision: 365180 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:00:49 -0000 Author: mjg Date: Tue Sep 1 22:00:48 2020 New Revision: 365180 URL: https://svnweb.freebsd.org/changeset/base/365180 Log: pccbb: clean up empty lines in .c and .h files Modified: head/sys/dev/pccbb/pccbb.c head/sys/dev/pccbb/pccbbreg.h Modified: head/sys/dev/pccbb/pccbb.c ============================================================================== --- head/sys/dev/pccbb/pccbb.c Tue Sep 1 22:00:30 2020 (r365179) +++ head/sys/dev/pccbb/pccbb.c Tue Sep 1 22:00:48 2020 (r365180) @@ -193,7 +193,7 @@ static struct resource * cbb_find_res(struct cbb_softc *sc, int type, int rid) { struct cbb_reslist *rle; - + SLIST_FOREACH(rle, &sc->rl, link) if (SYS_RES_MEMORY == rle->type && rid == rle->rid) return (rle->res); @@ -405,7 +405,6 @@ cbb_teardown_intr(device_t dev, device_t child, struct return (0); } - void cbb_driver_added(device_t brdev, driver_t *driver) { @@ -884,7 +883,7 @@ cbb_current_voltage(device_t brdev) { struct cbb_softc *sc = device_get_softc(brdev); uint32_t ctrl; - + ctrl = cbb_get(sc, CBB_SOCKET_CONTROL); switch (ctrl & CBB_SOCKET_CTRL_VCCMASK) { case CBB_SOCKET_CTRL_VCC_5V: @@ -1496,7 +1495,6 @@ cbb_pcic_set_memory_offset(device_t brdev, device_t ch /************************************************************************/ /* BUS Methods */ /************************************************************************/ - int cbb_activate_resource(device_t brdev, device_t child, int type, int rid, Modified: head/sys/dev/pccbb/pccbbreg.h ============================================================================== --- head/sys/dev/pccbb/pccbbreg.h Tue Sep 1 22:00:30 2020 (r365179) +++ head/sys/dev/pccbb/pccbbreg.h Tue Sep 1 22:00:48 2020 (r365180) @@ -62,7 +62,6 @@ * Register definitions for PCI to Cardbus Bridge chips */ - /* PCI header registers */ #define CBBR_SOCKBASE 0x10 /* len=4 */ @@ -187,7 +186,6 @@ # define TOPIC97_REG_CTRL_RI_DISABLE 0x00000004 # define TOPIC97_REG_CTRL_CAUDIO_OFF 0x00000002 # define TOPIC_REG_CTRL_CAUDIO_INVERT 0x00000001 - /* Socket definitions */ #define CBB_SOCKET_EVENT_CSTS 0x01 /* Card Status Change */