From nobody Thu Jul 28 19:30:49 2022 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 4Lv12y18Hbz4XhCp; Thu, 28 Jul 2022 19:30:50 +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 4Lv12y0kJ7z3gH9; Thu, 28 Jul 2022 19:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659036650; 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=5OPrxTRKD2h/v9VVzHBy5WRXFhs6jQsSHQWuKnGeRGE=; b=Kbb4MFi3PAT5QJbCVlA6HMFsne5xkHFKKD0o56oZem6I1yPdBl91cmjcByGjKH3+W5QceS t1IZqw7luhEOr5+SWMfBjHSN36gnZ9ciKzAYh5hY0CIBVVf+ZWw3q7/aZwgoCWePX1gbZH 8+My3zE6jfs/DaTLvkaqdgE5VpXRh8joDOKB5c+U8dE4HpbuLTsBOIu5jwlteR533JXcJ9 NMLdgwb35Tl62aJvhoiEs0HwfgPqqL4yj2khhAr+/1LjCR3YFUHGmQWwFx1xrS7hK6t7a+ ME9vZWtn1NPCbg9khaX053J0tqmuMNESlhYJ+gWhIscDFNO64vOLHSebinUv2A== 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 4Lv12x6wQhz17JS; Thu, 28 Jul 2022 19:30:49 +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 26SJUnTk032578; Thu, 28 Jul 2022 19:30:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26SJUnAA032577; Thu, 28 Jul 2022 19:30:49 GMT (envelope-from git) Date: Thu, 28 Jul 2022 19:30:49 GMT Message-Id: <202207281930.26SJUnAA032577@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: c019a1690b85 - main - hidbus(4): Align refcount checks for hidbus_intr_start() and hidbus_intr_stop(). 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: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c019a1690b85062729c775e2c820716edf5c37ea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659036650; 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=5OPrxTRKD2h/v9VVzHBy5WRXFhs6jQsSHQWuKnGeRGE=; b=iiGi7P1z1Qqv8jzUpL6LnRSjtLhDgD6tbJt5gXIJTnqipFWSY50UNB52uMBOdtgiRmVSsx FRTtbDSeFzurh0UNRWBXZXi6UY5GisBUMdxzJBXGl7JITsh4ZFfw3usXa9nF3Kb7W8IldT npyVQjym/08VvyXGCS7Q6wIa6xOcNJ6KutnWIrJMxfn05sXhYpNyyEQCZKK5KByPB9Tm1O fPmjiGjSSMfWcxFnT98pYhsIJorxavmECKcxaWZx1/+0UlqRUt9o4Hdh6f1RHrxc98JwAK 2d0025W5ucC4YXHEkoRHfJcILJFciw0QRvRd/FNw3mjNx10HSbjDLohGqUbRKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659036650; a=rsa-sha256; cv=none; b=r+O2tLEMfhCoK4/GwSNz4JhTw+POos3ynHJngC0O+4Z0hSuJrKdmy3ZwWd7rol3DBKvfAV oNg3lo5fxXu8SXIypso1CjLbH17vcjWz0C5x8aDcbP6PEbfJzyAQ/8vxJzBKJeB7xHJctm UcBHKzICEJV32Vs4lEYN4rvrVyW903RhyQbZTEYyTuloC8jZxvSEQYGwgWEoHW5t/1MTkS +OMLM6tmdDvrf2oxZhN/LGffW+82qdNBbqhtvmo/Y6DwDCjM7miKZtHaKz98zl/DIDapQs v9bbeZam0oVCayVSi3CjgM7eM7FzWspL7OJ9zH4LiaZQF1p9ugkuLZFG3KxlHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=c019a1690b85062729c775e2c820716edf5c37ea commit c019a1690b85062729c775e2c820716edf5c37ea Author: Hans Petter Selasky AuthorDate: 2022-06-23 13:44:25 +0000 Commit: Hans Petter Selasky CommitDate: 2022-07-28 19:28:36 +0000 hidbus(4): Align refcount checks for hidbus_intr_start() and hidbus_intr_stop(). No functional change intended. Discussed with: wulf @ MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/dev/hid/hidbus.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/hid/hidbus.c b/sys/dev/hid/hidbus.c index 496bdef05700..92a96b10bdbd 100644 --- a/sys/dev/hid/hidbus.c +++ b/sys/dev/hid/hidbus.c @@ -610,20 +610,20 @@ hidbus_intr_start(device_t child) struct hidbus_softc *sc = device_get_softc(bus); struct hidbus_ivars *ivar = device_get_ivars(child); struct hidbus_ivars *tlc; - int refcnt = 0; + bool refcnted = false; int error; if (sx_xlock_sig(&sc->sx) != 0) return (EINTR); CK_STAILQ_FOREACH(tlc, &sc->tlcs, link) { - refcnt += tlc->refcnt; + refcnted |= (tlc->refcnt != 0); if (tlc == ivar) { mtx_lock(tlc->mtx); ++tlc->refcnt; mtx_unlock(tlc->mtx); } } - error = refcnt != 0 ? 0 : HID_INTR_START(device_get_parent(bus)); + error = refcnted ? 0 : HID_INTR_START(device_get_parent(bus)); sx_unlock(&sc->sx); return (error); @@ -636,7 +636,7 @@ hidbus_intr_stop(device_t child) struct hidbus_softc *sc = device_get_softc(bus); struct hidbus_ivars *ivar = device_get_ivars(child); struct hidbus_ivars *tlc; - bool refcnt = 0; + bool refcnted = false; int error; if (sx_xlock_sig(&sc->sx) != 0) @@ -648,9 +648,9 @@ hidbus_intr_stop(device_t child) --tlc->refcnt; mtx_unlock(tlc->mtx); } - refcnt += tlc->refcnt; + refcnted |= (tlc->refcnt != 0); } - error = refcnt != 0 ? 0 : HID_INTR_STOP(device_get_parent(bus)); + error = refcnted ? 0 : HID_INTR_STOP(device_get_parent(bus)); sx_unlock(&sc->sx); return (error);