From owner-svn-src-all@freebsd.org Tue Sep 1 21:40:31 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 1EB6737AD7D; Tue, 1 Sep 2020 21:40:31 +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 4Bh0qM05Zpz4Pnl; Tue, 1 Sep 2020 21:40:31 +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 DB07B1FB60; Tue, 1 Sep 2020 21:40:30 +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 081LeUeG033043; Tue, 1 Sep 2020 21:40:30 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LeUY7033042; Tue, 1 Sep 2020 21:40:30 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012140.081LeUY7033042@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 21:40:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365114 - head/sys/dev/asmc X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/asmc X-SVN-Commit-Revision: 365114 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 21:40:31 -0000 Author: mjg Date: Tue Sep 1 21:40:30 2020 New Revision: 365114 URL: https://svnweb.freebsd.org/changeset/base/365114 Log: asmc: clean up empty lines in .c and .h files Modified: head/sys/dev/asmc/asmc.c head/sys/dev/asmc/asmcvar.h Modified: head/sys/dev/asmc/asmc.c ============================================================================== --- head/sys/dev/asmc/asmc.c Tue Sep 1 21:40:13 2020 (r365113) +++ head/sys/dev/asmc/asmc.c Tue Sep 1 21:40:30 2020 (r365114) @@ -371,7 +371,6 @@ struct asmc_model asmc_models[] = { ASMC_LIGHT_FUNCS, ASMC_MBA7_TEMPS, ASMC_MBA7_TEMPNAMES, ASMC_MBA7_TEMPDESCS }, - { NULL, NULL } }; @@ -389,7 +388,6 @@ static device_method_t asmc_methods[] = { DEVMETHOD(device_attach, asmc_attach), DEVMETHOD(device_detach, asmc_detach), DEVMETHOD(device_resume, asmc_resume), - { 0, 0 } }; @@ -712,7 +710,6 @@ asmc_resume(device_t dev) return (0); } - #ifdef DEBUG void asmc_dumpall(device_t dev) { @@ -871,7 +868,6 @@ asmc_wait(device_t dev, uint8_t val) */ static int asmc_command(device_t dev, uint8_t command) { - int i; struct asmc_softc *sc = device_get_softc(dev); @@ -1171,7 +1167,6 @@ asmc_mb_sysctl_fansafespeed(SYSCTL_HANDLER_ARGS) return (error); } - static int asmc_mb_sysctl_fanminspeed(SYSCTL_HANDLER_ARGS) { @@ -1315,8 +1310,6 @@ asmc_sms_intrfast(void *arg) taskqueue_enqueue(sc->sc_sms_tq, &sc->sc_sms_task); return (FILTER_HANDLED); } - - static void asmc_sms_printintr(device_t dev, uint8_t type) Modified: head/sys/dev/asmc/asmcvar.h ============================================================================== --- head/sys/dev/asmc/asmcvar.h Tue Sep 1 21:40:13 2020 (r365113) +++ head/sys/dev/asmc/asmcvar.h Tue Sep 1 21:40:30 2020 (r365114) @@ -76,7 +76,6 @@ struct asmc_softc { */ #define ASMC_INTPORT_READ(sc) bus_read_1(sc->sc_ioport, 0x1f) - /* Number of keys */ #define ASMC_NKEYS "#KEY" /* RO; 4 bytes */ @@ -292,7 +291,6 @@ struct asmc_softc { "GPU Die", "Memory Bank A1", "Memory Module A1", \ "PCH Die" } - #define ASMC_MBP112_TEMPS { "TB0T", "TB1T", "TB2T", "TBXT", "TC0E", \ "TC0F", "TC0P", "TC1C", "TC2C", "TC3C", \ "TC4C", "TCFC", "TCGC", "TCSA", "TCTD", \ @@ -349,8 +347,6 @@ struct asmc_softc { "TM0S", "TP0P", "TPCD", "TW0P", "Ta0P", \ "TaSP", "Th1H", "Th2H", "Ts0P", "Ts0S", \ "Ts1S" } - - #define ASMC_MM_TEMPS { "TN0P", "TN1P", NULL } #define ASMC_MM_TEMPNAMES { "northbridge1", "northbridge2" } #define ASMC_MM_TEMPDESCS { "Northbridge Point 1", \ @@ -433,7 +429,7 @@ struct asmc_softc { "memory_proximity", "pch_controller_proximity", \ "pch_controller_die", "pwr_supply", \ "wireless_proximity", } - + #define ASMC_MM52_TEMPDESCS { "Ambient Air Proximity Temperature", \ "Combo Ambient CPU PCH Wireless DIMM Temperature", \ "CPU Die Temperature", "CPU Proximity Temperature", \ @@ -585,7 +581,6 @@ struct asmc_softc { "Te3F", "Te3S", "Te4F", "Te4S", "Te5F", \ "Te5S", "TeGG", "TeGP", "TeRG", "TeRP", \ "TeRV", "Tp0C", "Tp1C", "TpPS", "TpTG", } - #define ASMC_MBA_TEMPS { "TB0T", NULL } #define ASMC_MBA_TEMPNAMES { "enclosure" } #define ASMC_MBA_TEMPDESCS { "Enclosure Bottom" }