From nobody Fri Feb 20 06:35:44 2026 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 4fHL9F0CyDz6SGhZ for ; Fri, 20 Feb 2026 06:35:45 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fHL9D6GWwz3kJC for ; Fri, 20 Feb 2026 06:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771569344; 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=eQ9pesFe/Ao465AzA673O2Sf6/X5V7T2jdWFIR6lnMI=; b=Jhs8o78ztNu96i/xZXdLPWML5HcrDKHZC9irj1Sdk17e50aFgpBLE4aiFbvvKk9STsjvhK rVBwduP7GY71oyMqC5jaGkFkgdgCDFFcxFVlBc8jDux7TS72oUMkuTSP5t1lH3CPAEfX5g kRB4gMU3Dx6gk44f2SlHd0fi9Ti9A6uuxEOLTvLPSa2g19Tk0iCOj6OK0nMQqS6a48fKMs uVtLus28DmWK2eDH7P3D30FG17P9hU+VzOPholtJ5Ap1hyqZRVfwOdU8A/mTFj5175YVoL SzJiFnYqJhU8DZd/BMl2wy4WKXU4hmFEfFSOhgFV7TFQRjaINLZaaly3fdItUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771569344; a=rsa-sha256; cv=none; b=Kof6gZQV3t32fbPTDEUECgqq0aWsiYqN8bqOXt/LAb76CPWcltSfC5IG++EnxvFtZ2wgre OVH5Sg1LpuYdkzY5ZnrRZrNMNPBqokbv3EQA4XMoyjKMmdXOve1+BDmd+8lcUBG4eAefi2 eRUfjOofyTVr48FpTkH17tdUYHeSyz2lEy9rezZ+xHuX2BpQfwaHKF7EHCtySEmmDP9DeG 8EHmPYaaFDMwL6RV528ZQHIiFAXNbufWGTyeB0okkBzV1ktVbycOL8hVFYG4jxF/M/MDQ9 t7lErRav9B9eJaQXMm7kjfK4nTPsUT8vq7DLlSzHneIZ9t5/TkHOXZ3pkWnPVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771569344; 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=eQ9pesFe/Ao465AzA673O2Sf6/X5V7T2jdWFIR6lnMI=; b=bk3FnMKGH4F2Liieu5f+ILWppFR3a8lyNFLPE+/k4ccXIz3yjiCYXOrHBLV7QMXBai6wam Bv3pnHWr00hPQXzVEhBM/B1um72J4csRsMBfyDhv4vRqKjE0TvcOcysUBHI0y0hktUjLPn QfcQ3eVp5DdtuR8zhtkipERAxarVJFtm0BvYIeGObKYR5ioQX6fbifAePEK4ArgEKNQocX vFu940GgoSBs/8V4leAoWLvi9PF2bCjHfgciR+DkBGkZBcxW/N1Z7emt7k/SRg6kJrkiVQ aFMUhOQNmeC6T9/QFsW5pBZZtagxIn6uB3Iu5M4F/oSVQEKxRBGjZH+cvCiYyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHL9D5QBpz1wC for ; Fri, 20 Feb 2026 06:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cc96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 06:35:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: ef1cde51032d - main - chore: asmc: use designated initializers in macros 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef1cde51032d395492caae302fedf183c58a482b Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 06:35:44 +0000 Message-Id: <699800c0.3cc96.15c4d8c7@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=ef1cde51032d395492caae302fedf183c58a482b commit ef1cde51032d395492caae302fedf183c58a482b Author: Enji Cooper AuthorDate: 2026-02-20 06:31:21 +0000 Commit: Enji Cooper CommitDate: 2026-02-20 06:35:16 +0000 chore: asmc: use designated initializers in macros This code cleanup makes it easier for human readers to understand what each of the fields actually represents, as well as makes it easier to modify what the macros actually do under the covers, without introducing potential human errors. No functional change intended. MFC after: 1 week --- sys/dev/asmc/asmc.c | 61 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 880da33ad9f3..b5cf123bd99f 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -134,31 +134,46 @@ struct asmc_model { static const struct asmc_model *asmc_match(device_t dev); -#define ASMC_SMS_FUNCS asmc_mb_sysctl_sms_x, asmc_mb_sysctl_sms_y, \ - asmc_mb_sysctl_sms_z - -#define ASMC_SMS_FUNCS_DISABLED NULL, NULL, NULL - -#define ASMC_FAN_FUNCS asmc_mb_sysctl_fanid, asmc_mb_sysctl_fanspeed, asmc_mb_sysctl_fansafespeed, \ - asmc_mb_sysctl_fanminspeed, \ - asmc_mb_sysctl_fanmaxspeed, \ - asmc_mb_sysctl_fantargetspeed - -#define ASMC_FAN_FUNCS2 asmc_mb_sysctl_fanid, asmc_mb_sysctl_fanspeed, NULL, \ - asmc_mb_sysctl_fanminspeed, \ - asmc_mb_sysctl_fanmaxspeed, \ - asmc_mb_sysctl_fantargetspeed - -#define ASMC_LIGHT_FUNCS asmc_mbp_sysctl_light_left, \ - asmc_mbp_sysctl_light_right, \ - asmc_mbp_sysctl_light_control +#define ASMC_SMS_FUNCS \ + .smc_sms_x = asmc_mb_sysctl_sms_x, \ + .smc_sms_y = asmc_mb_sysctl_sms_y, \ + .smc_sms_z = asmc_mb_sysctl_sms_z + +#define ASMC_SMS_FUNCS_DISABLED \ + .smc_sms_x = NULL, \ + .smc_sms_y = NULL, \ + .smc_sms_z = NULL + +#define ASMC_FAN_FUNCS \ + .smc_fan_id = asmc_mb_sysctl_fanid, \ + .smc_fan_speed = asmc_mb_sysctl_fanspeed, \ + .smc_fan_safespeed = asmc_mb_sysctl_fansafespeed, \ + .smc_fan_minspeed = asmc_mb_sysctl_fanminspeed, \ + .smc_fan_maxspeed = asmc_mb_sysctl_fanmaxspeed, \ + .smc_fan_targetspeed = asmc_mb_sysctl_fantargetspeed + +#define ASMC_FAN_FUNCS2 \ + .smc_fan_id = asmc_mb_sysctl_fanid, \ + .smc_fan_speed = asmc_mb_sysctl_fanspeed, \ + .smc_fan_safespeed = NULL, \ + .smc_fan_minspeed = asmc_mb_sysctl_fanminspeed, \ + .smc_fan_maxspeed = asmc_mb_sysctl_fanmaxspeed, \ + .smc_fan_targetspeed = asmc_mb_sysctl_fantargetspeed + +#define ASMC_LIGHT_FUNCS \ + .smc_light_left = asmc_mbp_sysctl_light_left, \ + .smc_light_right = asmc_mbp_sysctl_light_right, \ + .smc_light_control = asmc_mbp_sysctl_light_control #define ASMC_LIGHT_FUNCS_10BYTE \ - asmc_mbp_sysctl_light_left_10byte, \ - NULL, \ - asmc_mbp_sysctl_light_control - -#define ASMC_LIGHT_FUNCS_DISABLED NULL, NULL, NULL + .smc_light_left = asmc_mbp_sysctl_light_left_10byte, \ + .smc_light_right = NULL, \ + .smc_light_control = asmc_mbp_sysctl_light_control + +#define ASMC_LIGHT_FUNCS_DISABLED \ + .smc_light_left = NULL, \ + .smc_light_right = NULL, \ + .smc_light_control = NULL static const struct asmc_model asmc_models[] = { {