From nobody Sun Jun 9 14:12:12 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 4VxxhY1llqz5MCKW; Sun, 09 Jun 2024 14:12:13 +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 4VxxhX4l5Gz4DCW; Sun, 9 Jun 2024 14:12:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717942332; 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=cWSHuCtHBwIbGzMoB70x0ZKrIRS8oY16ZDaauo/4Pu0=; b=BajbScL82f0qJICNLm1wPHL8sKFl5TgOhLLxOMxCJD33M7T9BunSa6AtHZ15Rp7LqzO4nr RBy8vX0BRHVuVxq5zo7ZcK1s/N7yLAejcYsY/L8pg/JMECmQi2pYA0SOqMjZaM0OOVDL+M oSpHav9mS/hcNa5qBE204W4kUDjtT/B3jhTEiHlZEtXg09mMusSu7ZJV3xo0gZfn+NE3UA LVcEVe5uji2HTAB/AhxnlH8yrOQOO/SFK7qrTpZU5gaWxjNnMqKA5K9YUxbHWKKkahCU1h DYzUWoLARh5Qw4XqWQpges+T2otgmCpDfQP+BroPHCIeFaZiGWc6dzStAiNTow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717942332; a=rsa-sha256; cv=none; b=RByrYGf0xsxs0+mqp3e+OoMQPyEatEhjk5vjuNUpexfabk0fS0OemIHPXTesYDl+PWcSOR 3Quk/SNug3mfAbMQkezwOonzrpiE6lqrL6JplnRS1GEJGNyzeMC02MDCf6Oo9a3YlMCxkQ ZX1k39mCskWO6xTTU0geK4hu6wggG/teiJ7I+SgOukZRBZ46M4oOySa0CPYjCOi3aa6Pcn tWNkZudHgXJ4gH/UWfrxtKiqBoNfnZhupMFUeYf1i/9TCA1cg3eW1RWbK7xIJU4N4qtJW1 jbgP91JbXlrxLgCBWAs2DhP+D0SuqJQZFlJTiuR6Pl9M/S8lYBhqbslMhNPtBg== 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=1717942332; 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=cWSHuCtHBwIbGzMoB70x0ZKrIRS8oY16ZDaauo/4Pu0=; b=H4YLvpWzUmkfKvD6ae9iXmneuhbDD5jFEMC0ask2DyX2ekPFeX8ck2q+SAPl11mbJfirZk 2aSwVQXSFjrjXgxTWvkb5S9tsoT/aZkdNdMdgDa2skCiudw8fjgKbtg/NA+/qTqE35Rs1B MXGNa7sWiTIa7pb81TUPaXki2QvmS27Ck675brsJaQKJvAZX1r3WUchlvm5RLKeYduGVRn 7JQuI7M0CNInMqxF0rjzMZhwM7hjHfpOv7uIivXuJrytAJhC6wSfnAvsxAl61atURBgwYe fqiaRv1cQPLOCq4d4rw3D4T0mmI0SqA00ZVAMtPupxAZJYSeSaWSeEEcNdvQHA== 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 4VxxhX4MSrzm31; Sun, 9 Jun 2024 14:12:12 +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 459ECCWw085858; Sun, 9 Jun 2024 14:12:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 459ECCM6085855; Sun, 9 Jun 2024 14:12:12 GMT (envelope-from git) Date: Sun, 9 Jun 2024 14:12:12 GMT Message-Id: <202406091412.459ECCM6085855@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: 990567788613 - stable/14 - mvs: 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: 990567788613657aae9beded28858e7acb3bee48 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=990567788613657aae9beded28858e7acb3bee48 commit 990567788613657aae9beded28858e7acb3bee48 Author: Mark Johnston AuthorDate: 2024-02-04 23:53:28 +0000 Commit: Mark Johnston CommitDate: 2024-06-09 13:37:57 +0000 mvs: Use device_set_desc(f)() No functional change intended. MFC after: 1 week (cherry picked from commit a3b460d499a995eaf5a79d1b84e22b0d4eda8f2a) --- sys/dev/mvs/mvs.c | 2 +- sys/dev/mvs/mvs_pci.c | 4 +--- sys/dev/mvs/mvs_soc.c | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c index 250040898022..21e0984342d0 100644 --- a/sys/dev/mvs/mvs.c +++ b/sys/dev/mvs/mvs.c @@ -106,7 +106,7 @@ static int mvs_ch_probe(device_t dev) { - device_set_desc_copy(dev, "Marvell SATA channel"); + device_set_desc(dev, "Marvell SATA channel"); return (BUS_PROBE_DEFAULT); } diff --git a/sys/dev/mvs/mvs_pci.c b/sys/dev/mvs/mvs_pci.c index 9f4c835a9bce..5e5da6f35a7e 100644 --- a/sys/dev/mvs/mvs_pci.c +++ b/sys/dev/mvs/mvs_pci.c @@ -78,7 +78,6 @@ static struct { static int mvs_probe(device_t dev) { - char buf[64]; int i; uint32_t devid = pci_get_devid(dev); uint8_t revid = pci_get_revid(dev); @@ -86,9 +85,8 @@ mvs_probe(device_t dev) for (i = 0; mvs_ids[i].id != 0; i++) { if (mvs_ids[i].id == devid && mvs_ids[i].rev <= revid) { - snprintf(buf, sizeof(buf), "%s SATA controller", + device_set_descf(dev, "%s SATA controller", mvs_ids[i].name); - device_set_desc_copy(dev, buf); return (BUS_PROBE_DEFAULT); } } diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c index 849e1a012a53..5fccf36b5446 100644 --- a/sys/dev/mvs/mvs_soc.c +++ b/sys/dev/mvs/mvs_soc.c @@ -75,7 +75,6 @@ static struct { static int mvs_probe(device_t dev) { - char buf[64]; int i; uint32_t devid, revid; @@ -89,9 +88,8 @@ mvs_probe(device_t dev) for (i = 0; mvs_ids[i].id != 0; i++) { if (mvs_ids[i].id == devid && mvs_ids[i].rev <= revid) { - snprintf(buf, sizeof(buf), "%s SATA controller", + device_set_descf(dev, "%s SATA controller", mvs_ids[i].name); - device_set_desc_copy(dev, buf); return (BUS_PROBE_DEFAULT); } }