From nobody Thu Jun 27 15:31:12 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 4W92bP1sjbz5Pttw; Thu, 27 Jun 2024 15:31: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 4W92bN6Ynrz4CSJ; Thu, 27 Jun 2024 15:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502272; 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=UXcBYcJz0UOAc2RGPqm/42yJ1R9vpMJ+sG9TfTkAQ7c=; b=TcxSw9iZr9HDeUX7conKRMvYUx0cCTmjZ3iIK3NoOQDlqt1nFBAYUg2zAjJB36AlBFc8EB awuBVdqSFPmYCaZU1b6lLQEHLdE9nSkDucrY0ck+tjKTkkyALqRF0Vz9V3Vs//+wBKZX09 wd2MkXBadkig5lDv2CDd9oPbjCCBveSiwQznc+cbj+0M18gDRK8KOHet/P8BMTfz5DRiXs kanAPegCD6iycgucorG+o/uv/7yClt/lYV7GWtBTm1zFlaxkKe3yw1aJQNDJbmgfUBk06v wl0/ZUpSpy+1lTsKXWOnQmdBcXhdvA88DloB3VuoZr/+UwPuy6G1ZK3g/aSauw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502272; a=rsa-sha256; cv=none; b=fuDHpg7lSzTr1iKjsWRjDv95CWiahFMN8B04+jSFd/JV9b21zyX6AJm0usezJCEUJzGlGe MD/6+eX6w25bYl2MfZXmDhp4e/1hIgANT47CFAUhtyWWT0xKoq33WlMGibqWdhyLgfHtzR 8oMW4wR1YJZjAE37ZrfFnjQ/Zii3IOaeF6Q+Y8G0lnRpMWEKcIlCUHRnuxZRnvGlh3Nj94 GLD7ULOdxCymyebE9VEctm4hPBkky1XLmj5hRoOvVKSeEUf5Yh93fBiJLchyKE6oUAfOsM KgWDu7TeRKC41e+dwTFquhnUGLbBFUUqsYM9JWH6N57yYUD8H9mzVynTWN+WtA== 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=1719502272; 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=UXcBYcJz0UOAc2RGPqm/42yJ1R9vpMJ+sG9TfTkAQ7c=; b=MmAdtZ0toCU6kJYxXrygqjg7rV9j+HmQvmm2igJfWpAvD8ePVUEeJ5tpkSfjlN8gs6ioJ6 kAOKyUbQD3GvdEF6P8c7aBCiDh6qtMBGekZ2XDD7xRknq4KuPJKt/ot51K3nkvvxz8iNCz 3+WAzybCi9yfCw+0I7TDwvN46nhBD0QbV4YhQADlbS85DmB/CYOffKE2+NyMMSDzclTY/f WtoQ85FuyIxiWUN/LJ0ZtVwfZpo6I1xVWtKrbipyz6WhoSZ05l+owyvM5wG2xG3RDa91ce kY2mg8dmqegq6occ0IdRoc34GS2u/n9am8hS6AZV8tfwkYvPlG038P0QsdMnwQ== 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 4W92bN61q6zJDH; Thu, 27 Jun 2024 15:31: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 45RFVC6x078988; Thu, 27 Jun 2024 15:31:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFVCHp078985; Thu, 27 Jun 2024 15:31:12 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:12 GMT Message-Id: <202406271531.45RFVCHp078985@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: ddb9040fc2e9 - stable/14 - oce: 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: ddb9040fc2e972f99f379f9f18f551ee854f9107 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ddb9040fc2e972f99f379f9f18f551ee854f9107 commit ddb9040fc2e972f99f379f9f18f551ee854f9107 Author: Mark Johnston AuthorDate: 2024-06-05 19:28:13 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 oce: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit c704b87ba679563cb8b344da69aa3cb7118a10b0) --- sys/dev/oce/oce_if.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c index d7ec58ec1f5e..2084b9c84fff 100644 --- a/sys/dev/oce/oce_if.c +++ b/sys/dev/oce/oce_if.c @@ -252,7 +252,6 @@ oce_probe(device_t dev) uint16_t vendor = 0; uint16_t device = 0; int i = 0; - char str[256] = {0}; POCE_SOFTC sc; sc = device_get_softc(dev); @@ -265,9 +264,9 @@ oce_probe(device_t dev) for (i = 0; i < (sizeof(supportedDevices) / sizeof(uint32_t)); i++) { if (vendor == ((supportedDevices[i] >> 16) & 0xffff)) { if (device == (supportedDevices[i] & 0xffff)) { - sprintf(str, "%s:%s", "Emulex CNA NIC function", - component_revision); - device_set_desc_copy(dev, str); + device_set_descf(dev, + "%s:%s", "Emulex CNA NIC function", + component_revision); switch (device) { case PCI_PRODUCT_BE2: