From nobody Sun Jun 02 23:47:23 2024 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 4VstnR5xCFz5LVgS; Sun, 02 Jun 2024 23:47:23 +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 4VstnR47rQz4BN5; Sun, 2 Jun 2024 23:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372043; 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=11U1Ka7vpDVex2nj9QMYTuaxAwRZ8dr+kKahSCNcqN8=; b=WR6VLJStMREajnHZGym4Hd2kxHskAA4xJLgAVkTN6ZfAntkdKDnDGb6Uos/W7OJpoaSDuQ IqQcDVg7s/p6ITqQIzwlZeD75/MlJBVURjtoEqEhocn/MPzz3mtC+qiZovGnI01fziSRYh D4usywJFprNnTCV9KV3u2dY+6fhLmuouTpHglJI9pPL1QDvxxKdvwQn2eZ37syluSiMPEf y9smVG2mmYjdZSPfhiTwI2XQ/llElEQ4J7LwPSGr2JvK19Q7ReiqZ0/DpsmOdchTaVyhoh xmBRW76d63nTGvuFPL+vxzvbybIiCgwFkmc6Zc6PdAYq8G1/PWu7wK5f9v06GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372043; a=rsa-sha256; cv=none; b=ctFfK+PSz3MHgDJBnEoq1I8c9YMSI4VBXYhm/Kvli9QGaMRzydQdhvrODe/l14Z5gyPZ5I ovXlx4sDmgybi9Hm1dIHuOPZRR/Wwu6X0hN8sgDrGFj+fHF91ykp8RcmJvjxaomR5Y+BSF UwBUpHcj+Pw1l0coQ/gGrOQ7wq2gKs6dJ3JXb1yxtSt+qfm320NMTpIRMMG3FRBlDw2neo Jp4eR5VG24FHw+EVdABLfPyAbcQdjQQSlw/CN09a3uuMiKr0KiRAPzoFtEe1Zz8jzDNrwa +juDkva9f7bhsY+4RJzaUkMr0x6+u7UU94TxK+feHkCtBTabm61H3z8wXSEthQ== 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=1717372043; 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=11U1Ka7vpDVex2nj9QMYTuaxAwRZ8dr+kKahSCNcqN8=; b=hFYbSGXSo+7ynUD5bwf0vdZuZEOBaYWFc/epy83SP4Slpn2xbCztN+G9NFuSKzS+ybRgFq GnyjI/G9sCslBZPiTg8WsbRxlU74gfGVtGJqKx7tJcwXzTSrOVRIYLmNYOvePfMlYyaNs7 cMdXZE8VxEcGQ9Bh5eoS9oJTGSWZj46mbm/QcHemSX9NRLj/cP4E62j6b7ST13Q1YBNJVQ G8WxBBtQ4kZlagDD3+wmKevM8ATpQFFg41JJKUa7R2yzX7QvOshz0qSZxQf2lsvELzZ5up 277GtvqXOXIz8nsIbmVfamZXapDNluGoDpLo6jDhQaT5cqvTLEv1ib0iQ4qyrw== 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 4VstnR3bXFz1BlK; Sun, 2 Jun 2024 23:47:23 +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 452NlN9T056813; Sun, 2 Jun 2024 23:47:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlNpH056810; Sun, 2 Jun 2024 23:47:23 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:23 GMT Message-Id: <202406022347.452NlNpH056810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a3b460d499a9 - main - mvs: Use device_set_desc(f)() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3b460d499a995eaf5a79d1b84e22b0d4eda8f2a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a3b460d499a995eaf5a79d1b84e22b0d4eda8f2a commit a3b460d499a995eaf5a79d1b84e22b0d4eda8f2a Author: Mark Johnston AuthorDate: 2024-02-04 23:53:28 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:41 +0000 mvs: Use device_set_desc(f)() No functional change intended. MFC after: 1 week --- 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 a98a59259581..253fdc096475 100644 --- a/sys/dev/mvs/mvs.c +++ b/sys/dev/mvs/mvs.c @@ -105,7 +105,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 be9351403a0d..1dfd43ae6b1e 100644 --- a/sys/dev/mvs/mvs_pci.c +++ b/sys/dev/mvs/mvs_pci.c @@ -77,7 +77,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); @@ -85,9 +84,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 696b65d54359..00a868140a0e 100644 --- a/sys/dev/mvs/mvs_soc.c +++ b/sys/dev/mvs/mvs_soc.c @@ -74,7 +74,6 @@ static struct { static int mvs_probe(device_t dev) { - char buf[64]; int i; uint32_t devid, revid; @@ -88,9 +87,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); } }