From nobody Wed Jun 18 20:30:49 2025 X-Original-To: dev-commits-src-all@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 4bMwNp0Wlgz5q71n; Wed, 18 Jun 2025 20:30:50 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bMwNn73vLz3grQ; Wed, 18 Jun 2025 20:30:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750278650; 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=FriTjdyrXDsJO9Nu86f4p2B3I64uDArjiQugSAoEY+A=; b=BO7X3KPcSgZ+R/UaZ1Nhn2GxuFvlOEfcqGbGaDdgHs+WXndw33x40iXZBQVDDDMAWQp2U4 QnH18c5ksib+n01U9DI6Z4HfBq9zIlvoZX30Yw1KFm2gs5rMMFN+QcXKpZuB3iYGJBDqMG y1VeSa6rc100H/EfNiV+cg8a1G5+4YmKMd+Ma4EHDBYj1ZzX7cIP/DVaZrzZpH0lCfOQYE q9y5KGUrZSiOHYRUZ00KBKSa4pBRS/gg+BjY17Pz7bSvUt6N0F1UyzQPadBx8ZXqgBXYYa FJqSIxR3XKW4F3JTMTnlRaoTcSHSZVY11CMigDe4t7Vqs4Fxg0NTCc0c1aN1eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750278650; 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=FriTjdyrXDsJO9Nu86f4p2B3I64uDArjiQugSAoEY+A=; b=k5oaW1gu5Wq7Da/NhXko0NIqtGNmaXtFaTWmun1i8FbH7O0VyEBg8Gx5UrOpdWq7z4TFlo OB0CxoQ+hyTaJB8pqew67ayW+kMwuyXYP+nDKaENIiGgZBSsX/tnGTje4KJFdszQJ/1cO8 YSMRU54YoXIiX2rh5WzsXHJ/AoQUuJxQravqEsDmsun/X2Rr9s/WVoQCd4qWxbcGK8gkv+ GhCYTYm81t/Ze5bxS6Q+2rNsJBa4vVROV7IWJ3tbdWRT2pGYZCUfTZbOrg05KiynsAiJtd sa6HK6iOiWYSP402PPBSXrKNfcjN+JGvyGV36nHOPEzzD2SYgK+det7//eA4qQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750278650; a=rsa-sha256; cv=none; b=t1eilxxlB6I9oKVF9hP/EYWvTmGLqGwJR6ODYBFUPaunRCAZZfZicmLJ/VX0cyxePGj7j+ zc7Tdd97gIeuKvlLY5eunnZq+fxreds2qzBSpf4baV3AzXa3axetpnkageLECSivhDocp8 UZmBiCpAO/iOmU4veyheiCQm2z1qtfsg4MWLl7Cz4ZzQXrlYOecQT0PEufCk0NL9AFpj5j idcqfpWue4WkuwvFIhC7YlW5aFpPF0g12lzEj6b8o6sjlknUdKbYif7M0o4o90W14r2rUt 9mhijNq+0gBGgb4fX6odV+EKeRgdG08A7Ul5FwImAsrlMn0v6l0O6zBwJ5n5xw== 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 4bMwNn6dT1zkc2; Wed, 18 Jun 2025 20:30:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55IKUn3T087035; Wed, 18 Jun 2025 20:30:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55IKUnVJ087017; Wed, 18 Jun 2025 20:30:49 GMT (envelope-from git) Date: Wed, 18 Jun 2025 20:30:49 GMT Message-Id: <202506182030.55IKUnVJ087017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c329931c0225 - main - pass: Make the name of the driver a #define List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c329931c022513070ba86cfe9c96a5b27f508b15 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c329931c022513070ba86cfe9c96a5b27f508b15 commit c329931c022513070ba86cfe9c96a5b27f508b15 Author: Warner Losh AuthorDate: 2025-06-18 20:25:26 +0000 Commit: Warner Losh CommitDate: 2025-06-18 20:30:34 +0000 pass: Make the name of the driver a #define "pass" is in several places, but should be a #define. Make it one. This also lets folks with particular needs that copy this driver to reduce diffs. Sponsored by: Netflix --- sys/cam/scsi/scsi_pass.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c index 534ea945a54b..64b29eae7510 100644 --- a/sys/cam/scsi/scsi_pass.c +++ b/sys/cam/scsi/scsi_pass.c @@ -63,6 +63,8 @@ #include #include +#define PERIPH_NAME "pass" + typedef enum { PASS_FLAG_OPEN = 0x01, PASS_FLAG_LOCKED = 0x02, @@ -185,7 +187,7 @@ static void passflags(union ccb *ccb, uint32_t *cam_flags, static struct periph_driver passdriver = { - passinit, "pass", + passinit, PERIPH_NAME, TAILQ_HEAD_INITIALIZER(passdriver.units), /* generation */ 0 }; @@ -199,7 +201,7 @@ static struct cdevsw pass_cdevsw = { .d_ioctl = passioctl, .d_poll = passpoll, .d_kqfilter = passkqfilter, - .d_name = "pass", + .d_name = PERIPH_NAME, }; static const struct filterops passread_filtops = { @@ -505,7 +507,7 @@ passasync(void *callback_arg, uint32_t code, * process. */ status = cam_periph_alloc(passregister, passoninvalidate, - passcleanup, passstart, "pass", + passcleanup, passstart, PERIPH_NAME, CAM_PERIPH_BIO, path, passasync, AC_FOUND_DEVICE, cgd); @@ -616,7 +618,7 @@ passregister(struct cam_periph *periph, void *arg) */ cam_periph_unlock(periph); no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0; - softc->device_stats = devstat_new_entry("pass", + softc->device_stats = devstat_new_entry(PERIPH_NAME, periph->unit_number, 0, DEVSTAT_NO_BLOCKSIZE | (no_tags ? DEVSTAT_NO_ORDERED_TAGS : 0),