From nobody Thu Jun 27 15:31:04 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 4W92bG2gHsz5PtkZ; Thu, 27 Jun 2024 15:31: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 4W92bD6n2Kz4C9y; Thu, 27 Jun 2024 15:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502265; 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=ETp47ZbetvtbQ3ooPNN8XmKGrjey66uT12um0nZjTH8=; b=S1OnvjcqT1uqG1qZkMkKIezqWhKhiJW1VtFPB81Sf2rWb6t2X1hzzdngxXyt59KxSj3xyg bQrxYLR7Sl9dU6yr6aOBiuuzuGDSUvVNMr7QAz3mqfhT7MrsMN7j/CqlpfTTwRzKP8QMDX rzx62rN8xxm8rsUBEPw3NRRkV1OU9oqZc4YTbEGFmoWND2Jdv7Yqv5EC7eseJ2+j7XrRgw c7f5cLd8tXrfSTsCQUskOwqE5fvX635/9mQqxeEMmqaSbppinSuEBVx9KFHE3BI/9d0GKZ mttIwPPcsiavDzda2Vk3vx5Kf+j0KDqqDcyLPnCy6jdJhcEcCWyhr/LdvjqZSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502265; a=rsa-sha256; cv=none; b=NRpmxR8EWyT7Is0hzdwxokShjN5GPhSpYgUbFXAEYUKOe9OaIgMGHNOdDklUCAZRq/0MXy PVW15Le9Ifc74R8e03VZcEBwKYPN7XFbTDNDPkv6UJLYZp194zcR3Nk75P+dN4wvT3oh/z uL2vuYQ5f9e6wkEGr6/d6A484Pqz6WEPvhOKDS7hHYM1rnZXOlHtqkbHYb1hAJpbAJA4rR mLFg1VKm9UA7Nz6yN4E3z2b/FTf7TDcVB5gAkUMr3P6HK4I2taRVLYfOK3dIMnwOLH91yn THHwgeSudwmeQ0206ko6LfyT1TJuvxlCFPMFh9MwrmZphH/2h2DUPbGB1cGI5Q== 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=1719502264; 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=ETp47ZbetvtbQ3ooPNN8XmKGrjey66uT12um0nZjTH8=; b=aonf7PASlx0c7E0YDQC/F0VCsX5ZkL5rXJrfNFfvPdk3ylwQ1mSyq+iy25kryKIr6j501S Pld3DFfB1CSpU995bC/cSze6eXKLXDvmNInuU4FaR8jVHAvBSNtwLohuHCTh9MB2qDTKn3 JvqX32PKRCjP2qeB7zUx3tS+FD5l6JVTYZXJRlC62W7nWQUJlzw5wBIO2rD7fis0PuEHp8 XdYNKr6nqbZdCSaCpnGeZ2SJRNrbI3gz2n2U+IWqyfGsnLTLbsKGtZg6xgq4OJ8OFzPUIf cvzCpghcY/6k9LIqPUU6UAxkattjY+6SP5/7kJaVivbWp83kyaGePvTvY8cwIg== 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 4W92bD5NmNzHgW; Thu, 27 Jun 2024 15:31: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 45RFV4xg078724; Thu, 27 Jun 2024 15:31:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFV4D7078721; Thu, 27 Jun 2024 15:31:04 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:04 GMT Message-Id: <202406271531.45RFV4D7078721@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: d0983e084ba2 - stable/14 - liquidio: 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: d0983e084ba20799ed59deb69f77e10a25d7ef87 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d0983e084ba20799ed59deb69f77e10a25d7ef87 commit d0983e084ba20799ed59deb69f77e10a25d7ef87 Author: Mark Johnston AuthorDate: 2024-06-05 14:26:22 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 liquidio: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 1794a0a87e0cecee1ef63fcf4f0a8a6cf6945dc8) --- sys/dev/liquidio/lio_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/liquidio/lio_main.c b/sys/dev/liquidio/lio_main.c index bec510af0c65..aa52612dda04 100644 --- a/sys/dev/liquidio/lio_main.c +++ b/sys/dev/liquidio/lio_main.c @@ -200,7 +200,6 @@ lio_probe(device_t dev) uint16_t device_id; uint16_t subdevice_id; uint8_t revision_id; - char device_ver[256]; vendor_id = pci_get_vendor(dev); if (vendor_id != PCI_VENDOR_ID_CAVIUM) @@ -216,9 +215,8 @@ lio_probe(device_t dev) (device_id == tbl->device_id) && (subdevice_id == tbl->subdevice_id) && (revision_id == tbl->revision_id)) { - sprintf(device_ver, "%s, Version - %s", - lio_strings[tbl->index], LIO_VERSION); - device_set_desc_copy(dev, device_ver); + device_set_descf(dev, "%s, Version - %s", + lio_strings[tbl->index], LIO_VERSION); return (BUS_PROBE_DEFAULT); }