From nobody Sun Jun 09 14:12:05 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 4VxxhQ1ZYCz5MCBq; Sun, 09 Jun 2024 14:12:06 +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 4VxxhP5tkWz4D58; Sun, 9 Jun 2024 14:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717942325; 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=vlMlHxMs+heu/o5k2wPIAo0K+/WBspv78Cri5eaQurM=; b=oUDYyjbJDvAZE7bSz1nfdu+dwgRV12aBiQIXIvNkYfjLGBW8uL3biW7rxS2qzL9RCl/d4Q TTmM9z3LqKupQnXecbK9wbH3ql33oFdnn5IlmYPP2/bodnRGvgCxv6Zvm3CbB5XJkuTpIe dKEPybWmZKIEAHOpjZjVGAo66ZweNeESKZdgsEAByqMwvgVIqOdWrhnhyRJ+dC3asH9vhO RyVBWg2ybkTE/tLD5+8Vmf0CMW5/zgOwnIq3chksq0GLximeaqb+11H2sEhv3pUNuFMaIe AbrE4zlFNfosh757dSAKmibeuQK/fKmkCcenhnu37v9JgQW1pa+ew9v0XqGTxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717942325; a=rsa-sha256; cv=none; b=az1enTmO6AL1eWkW8vSuhyn8aDHdW51mSHu8xu53D1s5kxNH0xcgvjCHQQuVXNm6VuvcQ5 udPg0/spVtqCejR0o+K8eH9HPJY+CPH5cwpkioJ1GDit0HGH31SGyzAEyj+AK7Nyjvm2ck vqzctJPXL2iuDuYESiTE+C8sENOMJfhMOtRWARgJYwrwIn+RhuMjHMV/Y2iidNf0+U+JjN WVPh7A648i4thVWnZlnmRodQ49ED8ufHKR9YJ/fbrZd5ES6KITqs91rDi95FQ4xKMsYXMJ IaqsYI7oLJQZ5yruYNXiENXl+MmphDX6e+1yVb52W5p8K7c25RSqp1gFEgHk1Q== 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=1717942325; 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=vlMlHxMs+heu/o5k2wPIAo0K+/WBspv78Cri5eaQurM=; b=mBaXoWA2eBgGla0uKT+oy+Y+/U6mX11RIGoUPlRwW3LPwLqinPFVUHXxXasyAXwK8yupyH NZsdi4RCj/rwsoJ8eQxirkz7TIRIs434qd1z/M0S8EcbPP6vCbCmTr9YCdnGa2X9KGqnp2 7aJrVAPB03ZhdUj48jtpB3shYqfN8k5eetMNr+ebhKKu+24bnb9DgMGeRm1uzYMBYkhTiJ q1N//ZY6A/DXWbZxIAYnBjdRHJDc8C8OuHjhycTDuaCdWr98RzdPBkOIz4u7wG9qr8TvRx KT/j77DC1hVRVHsD+m5wn270LG46pT2fmRZCO1A0GdZTPMfWvn9gdV0wRZQzWg== 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 4VxxhP5SgmzlPK; Sun, 9 Jun 2024 14:12:05 +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 459EC5ne085636; Sun, 9 Jun 2024 14:12:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 459EC5Z7085633; Sun, 9 Jun 2024 14:12:05 GMT (envelope-from git) Date: Sun, 9 Jun 2024 14:12:05 GMT Message-Id: <202406091412.459EC5Z7085633@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: c5fe4fcda4fc - stable/14 - cxgbe: Use device_set_descf() 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: c5fe4fcda4fc4fc8274e8f8b32851d0ecec5dada Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c5fe4fcda4fc4fc8274e8f8b32851d0ecec5dada commit c5fe4fcda4fc4fc8274e8f8b32851d0ecec5dada Author: Mark Johnston AuthorDate: 2024-02-04 23:38:04 +0000 Commit: Mark Johnston CommitDate: 2024-06-09 13:37:51 +0000 cxgbe: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit a1b84451159fbad069ccaa4b5197a3fde7eae902) --- sys/dev/cxgbe/t4_main.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 6cb434295b42..f79bcfdabacf 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -2527,11 +2527,9 @@ reset_adapter_task(void *arg, int pending) static int cxgbe_probe(device_t dev) { - char buf[128]; struct port_info *pi = device_get_softc(dev); - snprintf(buf, sizeof(buf), "port %d", pi->port_id); - device_set_desc_copy(dev, buf); + device_set_descf(dev, "port %d", pi->port_id); return (BUS_PROBE_DEFAULT); } @@ -3504,12 +3502,10 @@ done: static int vcxgbe_probe(device_t dev) { - char buf[128]; struct vi_info *vi = device_get_softc(dev); - snprintf(buf, sizeof(buf), "port %d vi %td", vi->pi->port_id, + device_set_descf(dev, "port %d vi %td", vi->pi->port_id, vi - vi->pi->vi); - device_set_desc_copy(dev, buf); return (BUS_PROBE_DEFAULT); } @@ -5760,12 +5756,9 @@ set_params__post_init(struct adapter *sc) static void t4_set_desc(struct adapter *sc) { - char buf[128]; struct adapter_params *p = &sc->params; - snprintf(buf, sizeof(buf), "Chelsio %s", p->vpd.id); - - device_set_desc_copy(sc->dev, buf); + device_set_descf(sc->dev, "Chelsio %s", p->vpd.id); } static inline void