From nobody Mon Apr 6 10:30:39 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 345F52DCF7D for ; Mon, 30 Mar 2026 09:47:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774864032; cv=none; b=ga77CSSoYtUGBW634oKC+7gg0/dscSGvGzPaTdbRnOclMUmxaqQLJZ+7JeU0QQq4LHQfzAUMHdaUgjMQ3bbx4dDVjdrRTkhW36w/LmakSDG85oFdR/ZZDV6BnsO3ZGykTNZth8nc5RR22J3jizuVFwCKTXyVibeY6+T1ZXm0ciI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774864032; c=relaxed/simple; bh=v6HwNpkpGQh51L5gqE6ePHx59ZqX2d+LRTWFlz6MTNc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=DbGEAkONT4vevCIAvxosWu2c/mp4EApUvTsclYCga2hLEnd4Ub+Uhg3XRd8Mh+jcSlqxLK85IXarzgUt5Lt2spMGBdojggyXGZiYZqNtbKVtLROv6fd1yfXZP5qhLfcCn0BsrL3/O2S3P4aC9+e3RFqp7+18IygnnCAOvNkmrnc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=drXWTfyz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="drXWTfyz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 013BBC4CEF7; Mon, 30 Mar 2026 09:47:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774864032; bh=v6HwNpkpGQh51L5gqE6ePHx59ZqX2d+LRTWFlz6MTNc=; h=From:To:Cc:Subject:Date:From; b=drXWTfyzOtB5PigIuumSeEK4teSI8uCOCyjsjebxtZdBugPiST+p7sOIMQabEmy9z tR4ihtpa52C+iLTQLLkri4cTwj6426T1cUxy2Y50W97aRRNvcqrDiI8TV4ahY0DLzd jMu41XCJtDpxl91QIqMfODCjkzNhCippQnvMfdevSdOqP5w/wi2WJr6zLWfV4tQ11D z4x2IZ1aRmxlF0D9CTf0wVbCanWS9W57IpSbs7+hrkdyzKN04Is8KCXKNkkuEL+SAn 5riAKmKmCO2IFG4cnAsS/tDHyJa3J+LD5i5z3C/Jn5pnvmilO50KVzNQEI2Wwy0SG/ ygn8F0fbkBJXw== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1w79DB-00000006oMQ-2cDB; Mon, 30 Mar 2026 11:47:09 +0200 From: Johan Hovold To: Ian Abbott , H Hartley Sweeten Cc: Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH] comedi: ni_usb6501: refactor endpoint lookup Date: Mon, 30 Mar 2026 11:46:46 +0200 Message-ID: <20260330094646.1623523-1-johan@kernel.org> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use the common USB helper for looking up bulk and interrupt endpoints instead of open coding. Signed-off-by: Johan Hovold Reviewed-by: Ian Abbott --- drivers/comedi/drivers/ni_usb6501.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/drivers/comedi/drivers/ni_usb6501.c b/drivers/comedi/drivers/n= i_usb6501.c index 0dd9edf7bced..7afc5661a5ec 100644 --- a/drivers/comedi/drivers/ni_usb6501.c +++ b/drivers/comedi/drivers/ni_usb6501.c @@ -477,31 +477,16 @@ static int ni6501_find_endpoints(struct comedi_device= *dev) struct usb_interface *intf =3D comedi_to_usb_interface(dev); struct ni6501_private *devpriv =3D dev->private; struct usb_host_interface *iface_desc =3D intf->cur_altsetting; - struct usb_endpoint_descriptor *ep_desc; - int i; + int ret; =20 if (iface_desc->desc.bNumEndpoints !=3D 2) { dev_err(dev->class_dev, "Wrong number of endpoints\n"); return -ENODEV; } =20 - for (i =3D 0; i < iface_desc->desc.bNumEndpoints; i++) { - ep_desc =3D &iface_desc->endpoint[i].desc; - - if (usb_endpoint_is_bulk_in(ep_desc)) { - if (!devpriv->ep_rx) - devpriv->ep_rx =3D ep_desc; - continue; - } - - if (usb_endpoint_is_bulk_out(ep_desc)) { - if (!devpriv->ep_tx) - devpriv->ep_tx =3D ep_desc; - continue; - } - } - - if (!devpriv->ep_rx || !devpriv->ep_tx) + ret =3D usb_find_common_endpoints(iface_desc, &devpriv->ep_rx, + &devpriv->ep_tx, NULL, NULL); + if (ret) return -ENODEV; =20 if (usb_endpoint_maxp(devpriv->ep_rx) < RX_MAX_SIZE) --=20 2.52.0