From nobody Thu Jun 27 15:31:06 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 4W92bH4YyMz5Ptth; Thu, 27 Jun 2024 15:31:07 +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 4W92bH1YWDz4CMV; Thu, 27 Jun 2024 15:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502267; 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=IGe7A75tX6JUJ2VigcLiN/PXlzjKhbE99rFEPzlPhjo=; b=rW1LNPWSAriP1R2U9I5czTPEzMa02/577ky73BFFPV9QawZsI6OfI+r4ibSc/dLWx3K8o7 pYrk8GQA8UzU+gOHi47ODoRVYEEu0J/aatQSSvH02E9xwKm9GmrMftPFVolca9arrUuUxI afHCH4sLGW+c9jwIzJ/qRcqXYee3ZPCOAnw955QugL6VXcZzanvC9iDmY6wsUJf1sRmEds Zjj+RC/aLdkMpD2CIsO5bLdChBGyhVO6PxKLeM0+7sAXcJ6IsbgWks00ObCCs1+sTzwtUH GnCGpVmnCCTssv0ixFYimV5+o+OG1jQkeDaTk7aIHDmpMd5i84vH9HVdA8yudA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502267; a=rsa-sha256; cv=none; b=gzvmj0QzEbKJnJSw50YP+Gg3njS94JYDEIOrX5ROg0vq/a6sJ2esUWtFN+rvm6pOk0yos4 RaqJHa3MWew+DNQlsUGU4HFfsgSriulgkBGx7AXdaa51oIcleO8QYyUFzlYv5UytNcaUYo q24ZWtLxHq/MKRaWcL+GWCfc84bNYwYGLtKOHCltM5K0e6ZQcCej2ku2SaVvHNF86wlosq 1arzJ3JlY3wDX5JbQzTDBg/EesXAMwB20M9PUeIXxXjWlDGL8C0uw89AzqkzKPONyDeBPp ZoGy+GfilLR6RvgBYwmA87DIQLaDEGTgnD9MS09IE1QnhsnVZj5r4pWtoEJx4g== 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=1719502267; 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=IGe7A75tX6JUJ2VigcLiN/PXlzjKhbE99rFEPzlPhjo=; b=IdUJo7ZiIZcDXkAtVBwRHIuVtHdjQVW2lbGubMEybueOz9VhSm/M+PyUuE79kcyK/FxxYW ZlJIO3c5qN7k5ndCUveDznCN6USqlL/PKupB08NsicpD4KsCCEBwHfc8IuW/M7IE6Jhmv2 w7vKL+EjSL2lU0T7tyHVZA4uwLwtT9gjSWBuBUFPxRjSoaHhMMnjkzjTLDNh0Zxsrl2h6+ r4RZqdAEyGfWTTVFdCDQ0CrXAojvPKmAKEk2NhQ2eZxR3YZ2COXQGkrlRCWkaMjlWHvVvJ dRn2r4xVzUwLe7lTAdezmfMa2wHhorBLXdyQSObicECN6WKaWKflcWFeL4Ya7Q== 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 4W92bH0W1JzJBD; Thu, 27 Jun 2024 15:31: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 45RFV6js078802; Thu, 27 Jun 2024 15:31:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFV6VZ078799; Thu, 27 Jun 2024 15:31:06 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:06 GMT Message-Id: <202406271531.45RFV6VZ078799@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: 9f74e5edafdc - stable/14 - bge: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 9f74e5edafdc91469ab72f4900e46e27cfe72f54 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9f74e5edafdc91469ab72f4900e46e27cfe72f54 commit 9f74e5edafdc91469ab72f4900e46e27cfe72f54 Author: Mark Johnston AuthorDate: 2024-06-05 19:23:26 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 bge: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 50505c853c6cf1a4e8fac54d20c43f0f91ff0c67) --- sys/dev/bge/if_bge.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index a646ed226d3c..3e43b8e31442 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -2699,7 +2699,6 @@ bge_chipid(device_t dev) static int bge_probe(device_t dev) { - char buf[96]; char model[64]; const struct bge_revision *br; const char *pname; @@ -2727,9 +2726,8 @@ bge_probe(device_t dev) br != NULL ? br->br_name : "NetXtreme/NetLink Ethernet Controller"); } - snprintf(buf, sizeof(buf), "%s, %sASIC rev. %#08x", + device_set_descf(dev, "%s, %sASIC rev. %#08x", model, br != NULL ? "" : "unknown ", id); - device_set_desc_copy(dev, buf); return (BUS_PROBE_DEFAULT); } t++;