From nobody Wed Jun 7 04:14:45 2023 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 4QbYs14rlvz4bT5r; Wed, 7 Jun 2023 04:14:45 +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 4QbYs14M8Hz4N5R; Wed, 7 Jun 2023 04:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686111285; 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=bDbP6/XNUE2YnsPMV0ReN0AaPyd2Ctr4w7V04WLOlEw=; b=MiYZjXatL5AvhCUWBr8IiSBGuUMc4+pv9o6qDTw4I7ok6IwE6XLa6y5hePnK7VN2GRmi8v l6rTdcFP0n2Wl/t02favdnL39gmTUnbh+B7oM3/oDNqLu80gByDLPl8sT2CpeAP6AnBj7j ZMI5VJ5CKdU9TYWXhMzNYbHf98qECNed/I25bpeavzmN5LPCMlaE+oaCDEqxPOrbeG8HwX /BHCHl/JKyOAvgc92XEB5lWRLi8UG3yo18URLR7h3+9pic+HY8aXD8yHXfKhhtqi86poTN shIdsXD05tZntp9+k0YTcoPge9+gDxwQp74DRY9p8msffDN2IZ0VSc69cvNKcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686111285; 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=bDbP6/XNUE2YnsPMV0ReN0AaPyd2Ctr4w7V04WLOlEw=; b=TjRdNdBpxz9QGvuhjcdRRPvgzWc81dGmIO4C+WxIDBOTD98IfpvSlRKMCF/h4uHMt7dV5Q 2Ew/gfF8Mt6PyR+KeUsDCFZlIbos+qmEVe2ynNIiBAp93zOW/TiWga/SerhguH/EcH3zkm 8Q5MluCdrVAHbjixwu0kvq8EVZMjHiJUPao/Z9/fL1Ycg79JiyBjg+1+lvHFN0dR3SlOlc +KwF3zDC0OmRtrZZoJeABCs473XWt9TzH1jQOt65sLSHHXm8uO/UAS4OTBMAyrJzfVqS/K ftva49ZZGH7xEhTCvDnt5rgHxiLlIzJb1vCfOtRu41ZyqnKyHzbTScYV2izUAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686111285; a=rsa-sha256; cv=none; b=rFGZpnt1iwVDfgXyOFDqPjc4lbEv9SekiUAoNb2Qoaoy29oUmWv0U3Us+ObBP1TvPUI8IY 4vzw+JB/xd2Ff/4xHYGh0L1lbPCtpNq7lgZ62DAchwqAOqsB2tnHDYOFsh2KWaPq9yNEIG etNZEATatgMt9lezXEUDFaKeo6rg8rFteBLxN17vY0AtFoAp4UXzCVq2tNkcHZZBQ7uqhK OGYXk2wTgeq7Uw49fj8bGyPhFcxE0vebTkcuSQsOq0NeR5c6A3bAnlJTLSp5Ue90IRRaSW wHJuL0VPf01vqwfLpb+PXKuXSR1sUZfjOcglOhtFSyaG5rC9EnWPryq1gn02nw== 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 4QbYs13RX9zx8F; Wed, 7 Jun 2023 04:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3574EjA1071535; Wed, 7 Jun 2023 04:14:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3574Ej1I071534; Wed, 7 Jun 2023 04:14:45 GMT (envelope-from git) Date: Wed, 7 Jun 2023 04:14:45 GMT Message-Id: <202306070414.3574Ej1I071534@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 1177a6c8dcfd - main - gve: Unobfuscate code by using nitems directly for loop. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1177a6c8dcfd6625c541d6ffc3c6915b8b6354f7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=1177a6c8dcfd6625c541d6ffc3c6915b8b6354f7 commit 1177a6c8dcfd6625c541d6ffc3c6915b8b6354f7 Author: Xin LI AuthorDate: 2023-06-07 04:14:30 +0000 Commit: Xin LI CommitDate: 2023-06-07 04:14:30 +0000 gve: Unobfuscate code by using nitems directly for loop. While there, also make MODULE_PNP_INFO to reflect that the device description is provided. Reported-by: jrtc27 Reviewed-by: jrtc27, imp Differential Revision: https://reviews.freebsd.org/D40430 --- sys/dev/gve/gve_main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/gve/gve_main.c b/sys/dev/gve/gve_main.c index 383fd326d33a..c3ee6d5c3433 100644 --- a/sys/dev/gve/gve_main.c +++ b/sys/dev/gve/gve_main.c @@ -46,7 +46,6 @@ static struct gve_dev { } gve_devs[] = { { PCI_VENDOR_ID_GOOGLE, PCI_DEV_ID_GVNIC, "gVNIC" } }; -#define GVE_DEVS_COUNT nitems(gve_devs) struct sx gve_global_lock; @@ -717,7 +716,7 @@ gve_probe(device_t dev) vendorid = pci_get_vendor(dev); deviceid = pci_get_device(dev); - for (i = 0; i < GVE_DEVS_COUNT; i++) { + for (i = 0; i < nitems(gve_devs); i++) { if (vendorid == gve_devs[i].vendor_id && deviceid == gve_devs[i].device_id) { device_set_desc(dev, gve_devs[i].name); @@ -869,5 +868,5 @@ DRIVER_MODULE(gve, pci, gve_driver, gve_devclass, 0, 0); #else DRIVER_MODULE(gve, pci, gve_driver, 0, 0); #endif -MODULE_PNP_INFO("U16:vendor;U16:device", pci, gve, gve_devs, - GVE_DEVS_COUNT); +MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, gve, gve_devs, + nitems(gve_devs));