From nobody Sun Jun 02 23:47:15 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 4VstnJ47T2z5LVd7; Sun, 02 Jun 2024 23:47:16 +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 4VstnJ14RSz49vs; Sun, 2 Jun 2024 23:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372036; 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=YK32W9gIQK201cQuKO9SzoB1ozKTUCoglFluCqaKGi8=; b=NzEjdF7iotx95vvJ+sSO8EpC5wWbF2PFv95niC6ht8Jm6BBkZuR0BiAzpG9fn4zqmTQM96 Bhh90gW/Y6k4G8ojbD0/zaGUOyLhM1yvonaYWVB+WhMF3zFBzUzHrSjeoqMxdvCrnabczL ZkK+w2wbC81jz5iU7jA3o7DOK/COwYrSLxfkyrwn2ZaCRqDuScrGoEkeGZYKM+cOhr6t2L KRoV6GB34JMZpdV/hWRi6hrAzAjOKWXHS+8IcLLNgmrogFoykqTSAgZ+aMm1xX2UadB3Fc hLJ8zrnE1YPIvD/O+8b+7iDjITwww1qPC9CPcNSQhoL1hNCB0VqO02EAZoBkWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372036; a=rsa-sha256; cv=none; b=LxC9vOiahLV06WoHs/sh/1cMwNIJzBL6UKTeCfZBbmLkGNS/JEFzZM4nXjPNMKJs3UoRZ7 ziG2UxJsqllKx3GgWZ+pbYK/qfIWjko8opVXTYH19dPgFuIuhPM6C+Q+pt6UVvSmpU3FiM pq/7cF7QQkX7JEr9OUUuEfn+kzwBwXLlGVoyqRJ9hxl1nyXk7JqZqWpDhANHJ2CPjA7csR PlsXkiMF8zWp31gWoGfOtn+VZ/hHRWXHB0MxRSvXXylOmPkIsx/TFwa0ngpCEoYEQYmmVC FJx7BsN6H+H6N7EpJxrseQboFubx9zTAz9tsHVmS0NvUX6b7YE1AZTcV6eC4gA== 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=1717372036; 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=YK32W9gIQK201cQuKO9SzoB1ozKTUCoglFluCqaKGi8=; b=rP2O/odQD+vq/ZdjxzWyD8fnfNU+RjgPd0lczBcdnn/LEAadNtUPDw8j9d9t57oysKsM/w Zq5oru5R+CxiquHEwPBwHlb3NXnqFenwUng35uWn+5fKVHyYGrLcQQbmK04jJ8BTe+GLJY 4S5WQd+SZsLDDkB/YPfgbyDk2RaAOnbPQIk1g4p2aqfaIA43jCMaLmxYj4jNQYr8JKUGWM tZqtYWYd/wRrGt/g6lCNF11dr/mPUpn7awZ0gPLNOpQ4JDIxndzhtAvHEcZuy5EJ6lc/d4 mI+1OHGdK3/CQVoYYdbD9Ui4cIIUOkyi9VkMJBHQlCfl2x/O8jRtwxIwWGitDw== 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 4VstnH4YpPz1Bj7; Sun, 2 Jun 2024 23:47:15 +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 452NlFJS056545; Sun, 2 Jun 2024 23:47:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlFc3056542; Sun, 2 Jun 2024 23:47:15 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:15 GMT Message-Id: <202406022347.452NlFc3056542@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: 796bcf184518 - main - cxgb: 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/main X-Git-Reftype: branch X-Git-Commit: 796bcf184518ad7ac75b4abfd2bd351ea417fdb6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=796bcf184518ad7ac75b4abfd2bd351ea417fdb6 commit 796bcf184518ad7ac75b4abfd2bd351ea417fdb6 Author: Mark Johnston AuthorDate: 2024-02-04 23:36:54 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:40 +0000 cxgb: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/cxgb/cxgb_main.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c index 1a088cdf0abe..c5fc067f8312 100644 --- a/sys/dev/cxgb/cxgb_main.c +++ b/sys/dev/cxgb/cxgb_main.c @@ -360,7 +360,7 @@ static int cxgb_controller_probe(device_t dev) { const struct adapter_info *ai; - char *ports, buf[80]; + const char *ports; int nports; ai = cxgb_get_adapter_info(dev); @@ -373,8 +373,7 @@ cxgb_controller_probe(device_t dev) else ports = "ports"; - snprintf(buf, sizeof(buf), "%s, %d %s", ai->desc, nports, ports); - device_set_desc_copy(dev, buf); + device_set_descf(dev, "%s, %d %s", ai->desc, nports, ports); return (BUS_PROBE_DEFAULT); } @@ -447,7 +446,6 @@ cxgb_controller_attach(device_t dev) uint32_t vers; int port_qsets = 1; int msi_needed, reg; - char buf[80]; sc = device_get_softc(dev); sc->dev = dev; @@ -659,10 +657,9 @@ cxgb_controller_attach(device_t dev) G_FW_VERSION_MAJOR(vers), G_FW_VERSION_MINOR(vers), G_FW_VERSION_MICRO(vers)); - snprintf(buf, sizeof(buf), "%s %sNIC\t E/C: %s S/N: %s", - ai->desc, is_offload(sc) ? "R" : "", - sc->params.vpd.ec, sc->params.vpd.sn); - device_set_desc_copy(dev, buf); + device_set_descf(dev, "%s %sNIC\t E/C: %s S/N: %s", + ai->desc, is_offload(sc) ? "R" : "", + sc->params.vpd.ec, sc->params.vpd.sn); snprintf(&sc->port_types[0], sizeof(sc->port_types), "%x%x%x%x", sc->params.vpd.port_type[0], sc->params.vpd.port_type[1], @@ -966,13 +963,11 @@ static int cxgb_port_probe(device_t dev) { struct port_info *p; - char buf[80]; const char *desc; p = device_get_softc(dev); desc = p->phy.desc; - snprintf(buf, sizeof(buf), "Port %d %s", p->port_id, desc); - device_set_desc_copy(dev, buf); + device_set_descf(dev, "Port %d %s", p->port_id, desc); return (0); }