From nobody Thu Jun 27 15:31:03 2024 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 4W92bD13bkz5Ptr4; Thu, 27 Jun 2024 15:31:04 +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 4W92bC4lg0z4C99; Thu, 27 Jun 2024 15:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502263; 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=gmIwhnOx61R4gB6RMBw/LeJ6lud/9kiY5ZDt8IaqpME=; b=mpDE4LGnI6w28p/Ux4f5yXsB3Vj+TY03ZrrBrv/xZxmyPfQLq48l/zgohjZTIbKbS9GRKt oowOmpXus9tTUKY+xNNqS+eYi+L2qsncQ+6GF2GqEz5X1x+XzzwYZ/gbUIhcz4bF4ofA7L 2lwzVClNRHEQwCSE/F5yTMPnwPSUio93/32GkNbu+Qe7Gd7gA8i12JoqhKWLczWheASEIH IellDGdTcr6JOF0tu15hIlMvYmQ2vn9k1S1Z/qtJpagLH+U6LGOQJBlvgJhhCNw04R21Gr tcMogNDLbwSDIxeju7DLVfwWv0ph8StnuGT3/niwZBEEyuV3fiyIpE1bD41dpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502263; a=rsa-sha256; cv=none; b=w4w/iP6ieJNu3Yf4d9N5Ar2lR6I+BKAlXWv16d8n0t8khbKYt8V55cYxVrwll6T9QwOuVK HF5BhNPY0lrnPO3la+aeyjl6YIk/RiRSDM9mUfBE7yKt8K0PjhFhzNF86mLbWR8v6bnMQK DaLoaFgqi6sOJa28R4+R0WYjo0ScAerW5tCgF/yOCdAvXiluThqZltk5HML6CQSwSORSRD 8T5vA7iFBlbOVjMdWjnw6W7jqeoXDiTo/aqiA+WhfL2YvqmCYShq822KspJTIXzIAY1lkP 7BHRvpTSoTxwrGztVJeRKjCWKHz08+9q/OTUE+ICeUSn4LxRnwuM/vCAWUKzsw== 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=1719502263; 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=gmIwhnOx61R4gB6RMBw/LeJ6lud/9kiY5ZDt8IaqpME=; b=HJxcjSdYk7+Khztv965LP6CHFj8aBl6mZX5FfZappntRsyR1Am89c+WiMX40rQe85OA69H sDrz0caoj1m1bUaANCfUvNOqGf6/y+nG2OpBM7M1HhoTVCEeS1GL0TTcvCev0YzqOFTILO V+MuKXSf3A5b/GICV7nRe24TrHKEKuD1Ve141lrgPGPD5aCi8nhVs7zS6p8PFQd5VIFKGb w0zq9+qSaHtKhfgpT/NOhbCL0nG5R3XZTtGjftyB3n5Erq0/SaC3zDLWhkgC7TK1JFhfI3 JHt1n+Z4V4TpEcM3GCCtf1NKH1SiPwdp5Sp0zi2dg308nPFSveBqA5kyySjjuA== 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 4W92bC4MtRzJ7H; Thu, 27 Jun 2024 15:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFV3P0078688; Thu, 27 Jun 2024 15:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFV3G6078685; Thu, 27 Jun 2024 15:31:03 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:03 GMT Message-Id: <202406271531.45RFV3G6078685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 57d8375451c7 - stable/14 - msk: Use device_set_descf() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 57d8375451c7eb53049f45064afd60bd4c311391 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=57d8375451c7eb53049f45064afd60bd4c311391 commit 57d8375451c7eb53049f45064afd60bd4c311391 Author: Mark Johnston AuthorDate: 2024-06-05 14:20:58 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 msk: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 443f33481e461ae1f36e0110537131b972ec6a37) --- sys/dev/msk/if_msk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c index 4b6954e7d067..ea6157cbbec6 100644 --- a/sys/dev/msk/if_msk.c +++ b/sys/dev/msk/if_msk.c @@ -1565,7 +1565,6 @@ static int msk_probe(device_t dev) { struct msk_softc *sc; - char desc[100]; sc = device_get_softc(device_get_parent(dev)); /* @@ -1574,11 +1573,10 @@ msk_probe(device_t dev) * mskc_attach() will create a second device instance * for us. */ - snprintf(desc, sizeof(desc), + device_set_descf(dev, "Marvell Technology Group Ltd. %s Id 0x%02x Rev 0x%02x", model_name[sc->msk_hw_id - CHIP_ID_YUKON_XL], sc->msk_hw_id, sc->msk_hw_rev); - device_set_desc_copy(dev, desc); return (BUS_PROBE_DEFAULT); }