From nobody Sun Jun 16 20:38:04 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 4W2PwY0xjDz5PR71; Sun, 16 Jun 2024 20:38:05 +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 4W2PwX66ptz3xMX; Sun, 16 Jun 2024 20:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570284; 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=j6orLuqOfeuxEL+Xx4JzHJhLY/xrERZQ/vjHYwwmpoM=; b=tnsza/LR4C+lG5dh27Qonbuz0IBuhC/+6cCTeRAcso1HN2U0MN12zjV0nM9Hn4a71PkrZD ZyuFNXKYfCAvOn8EyQONJbmwBM4sMv3MNkDKjya87dIghrw+QfItYqtCg3sPe83Mir4/ta sMwBaQu4tI8McM+vdLh8u0U4qNwZqZr87yW0PRf03To27vgHsMruFaDtpuF4pTKGB9eWAk 9HI6SKvyPEa3ZY05f35BBKTtb9qKVrxThDFc1GeAkMrK04lms26d1hZ4jLEvojSeGDaI/f WLMFPCm/JYLPeVeKVD0X+waKRJRaBM4wUpnzTVRVLQwq611+8YgBlei9vlOICQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570284; a=rsa-sha256; cv=none; b=YnOWtmtM/tW7BLNVoyJwP4NuTm4XV3wRPlnrOoi8JLBZuFUKK6p83JRXqN5mgH5fLEsLak crcEjDS7QXH7pGfA3596uqg5gUoMjd64k2u2w6veghMQQaVvnvvPVgZT+etQWP6UgbW1lT 5oab1NkW7A+Q944KuY2t8RTsfjVjKrpafcrrJhNJXtSNi1xBaGbvAte/AZVC40aFLHaMHX oje/kDkaZsU1km+LkneWJVH+bWF8ihzHegfHb/COrjwv7QP5f5i7qg4hhbCUd3CxmVFU9M iGijbiTxhaUUOs0SjuCG3HDPiOi9TwsfFTXnIIdGnDIoL83SZAWCtQfaJtNvZw== 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=1718570284; 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=j6orLuqOfeuxEL+Xx4JzHJhLY/xrERZQ/vjHYwwmpoM=; b=IG5arHWtYzMuSnVKzfNBv4q1dDerxaU8jeI8EuVBi9/bthIfLI/BJ8VQapfFobzs69oas8 0wAEH+uBXOnWmvioMCEmPPSgbFk5Hni9GzvmUkodhdRiKYIatKRNDk1qg0S1qgiDrqfrIl +espx8+G0jafDBmWB+Vb9AYsd56zBer53cXFCi6Dx365WSNExSxZJBAlUnl72Lhlrf8VV8 Wf44e9v1jtq5zKmUTtEzMgHumgb0LOaUwlutfhQzazjoGMuPkU7KenPF2OM8fwteVUcdBC 5iXHb4wygu2gz5lu+bA0HXcEPo7tti0ovGaF1A5VCc7b1LAhZjxEnTbFYqn8Tw== 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 4W2PwX5jsKz12yb; Sun, 16 Jun 2024 20:38:04 +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 45GKc4uW079764; Sun, 16 Jun 2024 20:38:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKc4Fx079761; Sun, 16 Jun 2024 20:38:04 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:38:04 GMT Message-Id: <202406162038.45GKc4Fx079761@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: c704b87ba679 - main - oce: Use device_set_descf() 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: c704b87ba679563cb8b344da69aa3cb7118a10b0 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c704b87ba679563cb8b344da69aa3cb7118a10b0 commit c704b87ba679563cb8b344da69aa3cb7118a10b0 Author: Mark Johnston AuthorDate: 2024-06-05 19:28:13 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 oce: Use device_set_descf() No functional change intended. MFC after: 1 week --- 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: