From nobody Sun Jun 09 14:12:07 2024 X-Original-To: dev-commits-src-branches@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 4VxxhS2bB1z5MCfv; Sun, 09 Jun 2024 14:12:08 +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 4VxxhS0khXz4DBd; Sun, 9 Jun 2024 14:12:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717942328; 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=KMeQmnC0yz11ugNS6oSuWt5kaJRk6zoj7fAT2di6vB4=; b=QME/5H6hnk8geLEdDL6e1IeoKDHjRWUwznUxXf0ZVIVBWtxwovXkvRzCUwctSzG0GVFFue lfTaePIVzEDLTEePYedFsA5swY85KXithYwzWrtd44hFqCTkpuTSULg6AhTE+HKAq7MywF cMB+HQ7MyNw0xWu7tcmiftWpL/RVCger0O4jFv20eiTWEHA4ruvs3hEN2r2kBUY7KR72sr aEfZ5Cm9L4jPDFk1fczrZLuQx6K+VWPc8WpbAaKkZEIXWhKOlEnCn9PFmXZSo2xiWCBgRr eLKxa0EnYlT+J3HfxbqDSTgeg61Gmf/lrLdAFDhGpBIhVCyO1l0UPVYUq1taMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717942328; a=rsa-sha256; cv=none; b=lM7zXJKVmcvYTpkllFavFiI/OwsdvYVe1oSN1mMDmJIGQ2U8V5rslavsGDR29/kN9vjPwT gs3VEo2W/s2gVVlGkgI43TWkNrrWgEbnOsE9ToHD12xmTzHpuaCp8MCCccUfx08i9rxhYU N7Fm3DMPoqtnn/TEMRbwsUb5BdvMwehfuIspbGTzS64MsSPDPx55Hc5CcCcnNQQ56FqKcO mrEQAMbtpdtp83CCDVxXGEd08kXOQdzweazf2H13E2XVFMTA9jR1b2YVcT3okscUiLS1qo zXml1UH0C/pGGoHsgwwVBn/a+9UxmojUo7ffljsa7mObk5xK1wHh14c8WGdGyQ== 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=1717942328; 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=KMeQmnC0yz11ugNS6oSuWt5kaJRk6zoj7fAT2di6vB4=; b=KgCNIT3pmkmaKW+UMQXldSN7m7rKYw+4Nb2KANtbKKmRL9Ymmq4LsKmzz0NekFb5i/BcJy qhlNmOxht8OKhxWQ9M6yIhdmazNLIS9UqK4HKrgZOX5gZ0qoCbpWwEH+449xiR8SVBv77q vT6BpZD7+J/nHrxbyX/0Qou7ylp6bLxpLSG2JGYuVI02eMrBwI1nqgPSCs8iWpkB0nSYMZ bXIQQ1QIggxSSdexaurV2Tas8ABklx6rTs4ZdSfVIcYqR1O9BYKnmrrPv05IdAuTmSD/G4 r7i75n0cZ7YVw8/nhQGWh2LQCEAqbNQ/cBw69YWSlcbQG8wKI88ci4mPTXSJFQ== 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 4VxxhR74Zhzlx0; Sun, 9 Jun 2024 14:12:07 +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 459EC7mE085708; Sun, 9 Jun 2024 14:12:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 459EC7h0085705; Sun, 9 Jun 2024 14:12:07 GMT (envelope-from git) Date: Sun, 9 Jun 2024 14:12:07 GMT Message-Id: <202406091412.459EC7h0085705@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: 2b4333af7bef - stable/14 - siis: Use device_set_desc(f)() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 2b4333af7bef9824e0c08ba683fc08ac08fdc9e8 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2b4333af7bef9824e0c08ba683fc08ac08fdc9e8 commit 2b4333af7bef9824e0c08ba683fc08ac08fdc9e8 Author: Mark Johnston AuthorDate: 2024-02-04 23:44:11 +0000 Commit: Mark Johnston CommitDate: 2024-06-09 13:37:52 +0000 siis: Use device_set_desc(f)() No functional change intended. MFC after: 1 week (cherry picked from commit 17bfbc400f53ff1768c907b35c9cf045d540b8ab) --- sys/dev/siis/siis.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c index a0e5c1d4738d..1e5fd5648c2d 100644 --- a/sys/dev/siis/siis.c +++ b/sys/dev/siis/siis.c @@ -121,15 +121,13 @@ static struct { static int siis_probe(device_t dev) { - char buf[64]; int i; uint32_t devid = pci_get_devid(dev); for (i = 0; siis_ids[i].id != 0; i++) { if (siis_ids[i].id == devid) { - snprintf(buf, sizeof(buf), "%s SATA controller", + device_set_descf(dev, "%s SATA controller", siis_ids[i].name); - device_set_desc_copy(dev, buf); return (BUS_PROBE_DEFAULT); } } @@ -451,7 +449,7 @@ static int siis_ch_probe(device_t dev) { - device_set_desc_copy(dev, "SIIS channel"); + device_set_desc(dev, "SIIS channel"); return (BUS_PROBE_DEFAULT); }