From nobody Wed May 04 15:33:54 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 644BA1AB5BAD; Wed, 4 May 2022 15:33:55 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ktgpp6mTtz3vyj; Wed, 4 May 2022 15:33:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651678435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Ctp+EMadcEXEwcJ9jJFqUYN1n7f2Cw0fpVFWt2ZaEk=; b=e+famQGuXwAH6UeCIGVN/T9mKArnZJh7BEPm/U0SlTkU8QANOCdC6ei4yXSqBXXeQUXkub f276qk7S8/PruiXck0NjPOxZAz05cjsD8sAPB1H68C/7P79oUwQ8jxU4OQTQHvk5pRPnOM w88UEDBbbvoub5sf/TBrmrRR23dv+hLjMH0TPIvdPgmgnrlb/nruNmL6M8S9m4utqrp9Rb PjlkcRhLelX950/WoPFfNriyYvgCIj0nBVo7FqU5M9mr5KMihCrv4Ua4bgL0wU6FarEOxj UZn8O/ZpzT+MN6IU/mPsSgGtiJrTDTzKlHaes8bllpDjXHkEWbDWZxUyZWbD1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5DA0B15878; Wed, 4 May 2022 15:33:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 244FXsQ1046326; Wed, 4 May 2022 15:33:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 244FXsm5046325; Wed, 4 May 2022 15:33:54 GMT (envelope-from git) Date: Wed, 4 May 2022 15:33:54 GMT Message-Id: <202205041533.244FXsm5046325@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a31b0c0c47d8 - main - asmc: Style List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a31b0c0c47d8d976a063a0f2a51d456c6da66f22 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651678435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Ctp+EMadcEXEwcJ9jJFqUYN1n7f2Cw0fpVFWt2ZaEk=; b=QvDAW5FVytf1FO+IfYKAbMTQ1FWcXEJAw8iXznON/+mdRzoFjSN/ELLCDJBGwxiVokGkT0 pT+T4lj9aZh+yCQVhpNShJmSooK4ow3mZSs0SHTsiGHF6ZhASRoL/PHo/nfRb4gcGz5DTK kRJQ1y30KlvmbSlCAB/ZbWSJo/OnllR+3gGcwEUc2z4lr2fTqOXA7W+zkBwEYyMbKYIbWs ggLxFTkeG9aghcJ3ztT4uqsFOaXB+P6ZvjQdCBtuNw3IuQH29kT3KGNoPnpFM5oYVj3fuc rxyDbslMFklcHAakfowAUF7aTkHnP4dOfRVX/ky0ntVJc2fBucVZzHPdqg/y4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651678435; a=rsa-sha256; cv=none; b=GC0jr9OzLNh+oih2XDBCezUHXnOimLondays74D94D2kWmuK9zSkitX0Rf4fr5/9lFIKjr o1lZ06RekS6HpQyVCQszHqgz06SMcyl/Cm1Fyz8wBNmUOtjkRvYI9jQtzIva1WtuD0ti+m QviIoMl5yPjiISUsaOH5kve+iDNTFyOIpIrRTFVL98Paq948OBuHqXWwlpXWQulZMMvajx iCQd8nTegA9yeAhMu7mUnqNiQjbLw0mlAGweke+h6N+TEmlTH0SIiv258VBY2wA+sZ60Bj cptJzktPNOYOraGzPRMObAxX3WGsWNTHZAnOv9Ql3YOKYTDbiPwB+FrDTF71xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a31b0c0c47d8d976a063a0f2a51d456c6da66f22 commit a31b0c0c47d8d976a063a0f2a51d456c6da66f22 Author: Mark Johnston AuthorDate: 2022-05-04 14:54:33 +0000 Commit: Mark Johnston CommitDate: 2022-05-04 15:31:01 +0000 asmc: Style MFC after: 2 weeks --- sys/dev/asmc/asmc.c | 18 +++++++++--------- sys/dev/asmc/asmcvar.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 60c04a566088..9f18c7271042 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -271,14 +271,14 @@ static const struct asmc_model asmc_models[] = { ASMC_MM_TEMPS, ASMC_MM_TEMPNAMES, ASMC_MM_TEMPDESCS }, - /* The Mac Mini 2,1 has no SMS */ - { - "Macmini2,1", "Apple SMC Mac Mini 2,1", - ASMC_SMS_FUNCS_DISABLED, - ASMC_FAN_FUNCS, - ASMC_LIGHT_FUNCS_DISABLED, - ASMC_MM21_TEMPS, ASMC_MM21_TEMPNAMES, ASMC_MM21_TEMPDESCS - }, + /* The Mac Mini 2,1 has no SMS */ + { + "Macmini2,1", "Apple SMC Mac Mini 2,1", + ASMC_SMS_FUNCS_DISABLED, + ASMC_FAN_FUNCS, + ASMC_LIGHT_FUNCS_DISABLED, + ASMC_MM21_TEMPS, ASMC_MM21_TEMPNAMES, ASMC_MM21_TEMPDESCS + }, /* The Mac Mini 3,1 has no SMS */ { @@ -290,7 +290,7 @@ static const struct asmc_model asmc_models[] = { }, /* The Mac Mini 4,1 (Mid-2010) has no SMS */ - { + { "Macmini4,1", "Apple SMC Mac mini 4,1 (Mid-2010)", ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index 47550fb7691e..55f309208bf2 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -348,7 +348,7 @@ struct asmc_softc { "TaSP", "Th1H", "Th2H", "Ts0P", "Ts0S", \ "Ts1S" } -#define ASMC_MBP113_TEMPS { "TB0T", "TB1T", "TB2T", "TBXT", "TC0E", \ +#define ASMC_MBP113_TEMPS { "TB0T", "TB1T", "TB2T", "TBXT", "TC0E", \ "TC0F", "TC0P", "TC1C", "TC2C", "TC3C", \ "TC4C", "TCFC", "TCGC", "TCSA", "TCTD", \ "TCXC", "TG0D", "TG0P", "TG1D", "TG1F", \