From nobody Sun Jun 02 23:47:20 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 4VstnP0qTwz5LVk0; Sun, 02 Jun 2024 23:47:21 +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 4VstnN1tbQz4B9T; Sun, 2 Jun 2024 23:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372040; 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=oazrpWWlWT7bL7LwbsMPzHbE5vqteOn9Z+yQZ7LeE7I=; b=A76EwUSlSUGEJCVcOdxKf+g9007IzO0ATSbCfrs1Er62INfv24FSXPOJZmBnSHAD1vSUlF XZZAlDTMOSpkH1SxAi/y81CvNFEg2LW87holKeutXGNRFu10AO2l6f3wo3C1E7PzDJ1pN+ QU+8uy85xLee+dP3U80sTj4h4m8YmAKpSLR9tCRF0UmCoFrusiTTJXno6zLzW+/gpWsog+ /Erh6aFDDrqprlnJSSAdIuFrMMptc1BuJfaRwePS4Zd9ku32YQmEGkOeAv3f8u8D1YLval KXadY8NOHCUdAILedsgeymE3UUY2MbM9qj/pVuEMwRIRVSOmLqRLmdOhK+DUXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372040; a=rsa-sha256; cv=none; b=VNZdDd/xaxcsneaPNByA21m7MUvuByZ43sxT73NlbULyT3z13FbvVzjtl2uNa2X1kZr1YV hMbs8qZ0AUUg2aV9FaaJlFs1o57eeTtEjWMzzL63enrTYI/GOhM6Hk1JRKaxIEhcOPXz/U 4plwZtSM6Ns0uQ7WggG1QnlDpSYx98dpgbYiieVHlC/RH8puz0c8ySzgxAmpP1Bu1aQXHp KE0Qudytpz7L6PswPaNLaOi6A9FqfSYvWUfalFKRHs9yM8n8F0kdEMCMPcW7nSh5E7Y3Uj +Xnjwn5YwYrkWpc+MGVNbThsRqUYRnyXsvHcndhisdYGHW4ZM7p4FBo47fAgqg== 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=1717372040; 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=oazrpWWlWT7bL7LwbsMPzHbE5vqteOn9Z+yQZ7LeE7I=; b=hdfWhxYUCDhJja5q4xDzuY/2xe4P7OAR/H94zOsPf9U44UTAQYF8HtryDruF3nGrPCvLkZ kZuP3XfiJHdjWzZAsxtEiSJPTI/3FYoqoQmkbk96lI1QHRz86uP4xqoSpfYOg9ZyKft/do yyNhT0L33WzoxtxsmDkqrgTKQLqCx46y5oia1rqfmAvpwmfOnFVQKEFgmcuYBq29yMe4yY PYWIwGtcHMI0x7mKrtkF1V6ShtTlna05qQyZ0klokL03c4GRkyQaKAz0sUtQhOc+NKJZV+ /fLGoL4rsVBg769K0P0Z2OFv1D34oV/1CKHRt+yoJjMzLDYC2DjjszXLQev2nw== 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 4VstnN1BBjz1BnR; Sun, 2 Jun 2024 23:47:20 +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 452NlKXd056699; Sun, 2 Jun 2024 23:47:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlKGu056696; Sun, 2 Jun 2024 23:47:20 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:20 GMT Message-Id: <202406022347.452NlKGu056696@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: 801b12ba89af - main - qlnx: 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: 801b12ba89af6377e30c15b9b68443f0d60d50bf Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=801b12ba89af6377e30c15b9b68443f0d60d50bf commit 801b12ba89af6377e30c15b9b68443f0d60d50bf Author: Mark Johnston AuthorDate: 2024-02-04 23:46:51 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:41 +0000 qlnx: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/qlnx/qlnxe/qlnx_os.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 2b3732e748fd..21d39e809cc8 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -227,7 +227,6 @@ MODULE_DEPEND(if_qlnxev, ether, 1, 1, 1); MALLOC_DEFINE(M_QLNXBUF, "qlnxbuf", "Buffers for qlnx driver"); -char qlnx_dev_str[128]; char qlnx_ver_str[VER_SIZE]; char qlnx_name_str[NAME_SIZE]; @@ -374,60 +373,48 @@ qlnx_pci_probe(device_t dev) #ifndef QLNX_VF case QLOGIC_PCI_DEVICE_ID_1644: - snprintf(qlnx_dev_str, sizeof(qlnx_dev_str), "%s v%d.%d.%d", + device_set_descf(dev, "%s v%d.%d.%d", "Qlogic 100GbE PCI CNA Adapter-Ethernet Function", QLNX_VERSION_MAJOR, QLNX_VERSION_MINOR, QLNX_VERSION_BUILD); - device_set_desc_copy(dev, qlnx_dev_str); - break; case QLOGIC_PCI_DEVICE_ID_1634: - snprintf(qlnx_dev_str, sizeof(qlnx_dev_str), "%s v%d.%d.%d", + device_set_descf(dev, "%s v%d.%d.%d", "Qlogic 40GbE PCI CNA Adapter-Ethernet Function", QLNX_VERSION_MAJOR, QLNX_VERSION_MINOR, QLNX_VERSION_BUILD); - device_set_desc_copy(dev, qlnx_dev_str); - break; case QLOGIC_PCI_DEVICE_ID_1656: - snprintf(qlnx_dev_str, sizeof(qlnx_dev_str), "%s v%d.%d.%d", + device_set_descf(dev, "%s v%d.%d.%d", "Qlogic 25GbE PCI CNA Adapter-Ethernet Function", QLNX_VERSION_MAJOR, QLNX_VERSION_MINOR, QLNX_VERSION_BUILD); - device_set_desc_copy(dev, qlnx_dev_str); - break; case QLOGIC_PCI_DEVICE_ID_1654: - snprintf(qlnx_dev_str, sizeof(qlnx_dev_str), "%s v%d.%d.%d", + device_set_descf(dev, "%s v%d.%d.%d", "Qlogic 50GbE PCI CNA Adapter-Ethernet Function", QLNX_VERSION_MAJOR, QLNX_VERSION_MINOR, QLNX_VERSION_BUILD); - device_set_desc_copy(dev, qlnx_dev_str); - break; case QLOGIC_PCI_DEVICE_ID_8070: - snprintf(qlnx_dev_str, sizeof(qlnx_dev_str), "%s v%d.%d.%d", + device_set_descf(dev, "%s v%d.%d.%d", "Qlogic 10GbE/25GbE/40GbE PCI CNA (AH)" " Adapter-Ethernet Function", QLNX_VERSION_MAJOR, QLNX_VERSION_MINOR, QLNX_VERSION_BUILD); - device_set_desc_copy(dev, qlnx_dev_str); - break; #else case QLOGIC_PCI_DEVICE_ID_8090: - snprintf(qlnx_dev_str, sizeof(qlnx_dev_str), "%s v%d.%d.%d", + device_set_descf(dev, "%s v%d.%d.%d", "Qlogic SRIOV PCI CNA (AH) " "Adapter-Ethernet Function", QLNX_VERSION_MAJOR, QLNX_VERSION_MINOR, QLNX_VERSION_BUILD); - device_set_desc_copy(dev, qlnx_dev_str); - break; #endif /* #ifndef QLNX_VF */