From nobody Sun Jun 09 14:12:09 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 4VxxhT3nQRz5MCKN; Sun, 09 Jun 2024 14:12:09 +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 4VxxhT1gCgz4D5v; Sun, 9 Jun 2024 14:12:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717942329; 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=/rte5eLc8b5szyXz9hKiOmjrPCsaf3ukefB3oY4IoPA=; b=giZzBTEyc0sAZmUQi1CUShKcLT5YjgEwN3INlhusUhnGRS27h9+0OcJzZr4FvuMP1HkxVl 7j5pZMpiePif6cNyTvcwB0X5L+KdkIoslG3+9hje1iOS8KlvEwOA/xOleb5ufEwjYJ3JlI KBoS7+meHG3CN549wVBtE7YK/7gqeftbRFZVOAx6Bbf+daT5PQWuTHf6WmQgKgTQoIneCw 8A+1yJA8PkEk1PYXv0T5dZ5EZRmJ8VeOQl4VT2aex+gHLLnh8oDhWkK2lsZWvwK6k5StAE efeDB/LTFdWIo5+yxRxjl8XHMaempAw6IvgUlTTR3+8g5qlchYlBedGqqwyKfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717942329; a=rsa-sha256; cv=none; b=vfgTQbaXaOaRIPo2lXVHsthOyRungRgfhBDfAgRoTx0GIWuOGncTmBZ9JvpxahCU3HuEyZ 5mkcqv9Q7BSXNEuwmIHaZatblyfhhBB4nOUVvLHiwn9KIaxlMm6ZBWTbtlNdmq+KO++A8j D6riBhDpJvVn6trFOnavzYxvjtZyuaYGdrTxD4ZeoDJ7VpmPp8Zvz4JWjQ3e86aCWF8wFr LR8h5bLvC+DsBtbVECTxKyuICOSjIlLUDeuzt1KcdQRvgRWIprW9kT3jYTxrfGLe263IfJ iU/WJOKYUIwi+m8uNqs8L0TzqL+ZDL64SLdb0odLlGSb4fu5ogXU071tRIHpFw== 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=1717942329; 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=/rte5eLc8b5szyXz9hKiOmjrPCsaf3ukefB3oY4IoPA=; b=Rmq+yCk5Cu8hNjJSCzKXVCA3OG1y0DjoBJcEGDFPp4xV644SnuH+UjgI8WqKpmxJ6y4D7g sZlgjxC3DRH0y7YpGN7v35nhEN2N2AtoAczajfHHxeKa0alj+8M6Kn/20qgNMp/zqQ/yyz PCsqWtKaaXIbQN5DtXVjfKfL8bvPLemLIJMlLCo64GK0myHj1qR0NLUTHHhwNzSpy0o1VK MzQFkuzmJp+NoQh8IcGtMClqc9b7W9hZaZuuDkLKjPCCeXv7eLXFQt/CVVZScB6P0Gv3a/ 4IlQNjwO5zqdh7eeyzsRTRMgJ3ykjX9yoOyNneVx4uA5CdW48g9goz8PwbUqJw== 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 4VxxhT1GQFzljm; Sun, 9 Jun 2024 14:12:09 +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 459EC9YD085744; Sun, 9 Jun 2024 14:12:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 459EC9P1085741; Sun, 9 Jun 2024 14:12:09 GMT (envelope-from git) Date: Sun, 9 Jun 2024 14:12:09 GMT Message-Id: <202406091412.459EC9P1085741@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: dd8575e19ae0 - stable/14 - qlnx: 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: dd8575e19ae02e7e8a10abd8592ac764263e9176 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dd8575e19ae02e7e8a10abd8592ac764263e9176 commit dd8575e19ae02e7e8a10abd8592ac764263e9176 Author: Mark Johnston AuthorDate: 2024-02-04 23:46:51 +0000 Commit: Mark Johnston CommitDate: 2024-06-09 13:37:53 +0000 qlnx: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 801b12ba89af6377e30c15b9b68443f0d60d50bf) --- 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 */