From nobody Tue Jan 30 11:08:29 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 4TPMq22mk0z58dMy; Tue, 30 Jan 2024 11:08:30 +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 4TPMq20HGDz4HMQ; Tue, 30 Jan 2024 11:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706612910; 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=q2wMrFLd3FpRt8VocLFwPY04FlBkQz7FjRXO79e8ed8=; b=H1OmV6925HM+AXsHs1m7hd6HHiU3wkp0F1D6z8ujuK6d3z9GKPjPI5k/dhbVN9C6V6sRen 3NkGDFKZMAZMRlrciXauxO+fECdtZ0Tktyhzv0n8+z0MJXF10MK3/QcciHJAcjXXgtsSL0 J9ivyDOGwE/WdsYoANCsL+bM+9OE/v/TfXg6rtxEJmF5kyjOEvQBdfb5PCeYyae5ZvZ/ho xB0EOsJbNljqB8H5okvxNkuzMZxkeEiuKeushVdFAI0GEBacb1y11N1CwGSfs2GW45/2+F ndR/O+XVN7psJnIhkna6ULRPATQYUJ1YJ62tNN9PQbU8ODVu2MF40vqi5GSAnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706612910; 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=q2wMrFLd3FpRt8VocLFwPY04FlBkQz7FjRXO79e8ed8=; b=XbVK6hbTZwSbAdkAOGApQbh/CTdIQ0Ezd+f2DpiPHLW0rvt084A55qfQGwnl6MdusZVUdn HmjjTiLUFF2jA/9lOVupOThougwZcBYtvGF0uUn/snQr3Nkoq6aUUWptQXWK3xyL/i+kWK edsREVZIQADWe0A/wygd6yYMiKuCT93/6K26BQrr96S80P+XmGPKtBGUyegWopU/4FtMbx jZJKOb8a+uxE2SditeD+siAEve+gXJcgw8M2CuNOQ0tUnFt4L0YGuPyKiVYMyNcOHWl5Ry +yGLWgZ0XgGhB1kJEvQUQNMwi2fF/jPixrTPIm0RiF4xzLw1KnaquRzOqfczJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706612910; a=rsa-sha256; cv=none; b=HR8dhAjsntpuDjKbQe9lRLs7S/46GqsxlTkKsVfgw8b53zUegT/F7Ssaft0aaqeB45hwFv DDH+CCP4+/CBDLe0Z9vPiS6iePtsaiQemRDyGHWqOgtycPu7eBS/Zb+HwajfF0t+n9guLg NlrMjoeDCexVsm0yZ05iDBiY/Hxrtrhdr+yKgKLa+gKyM+iNF+u3MWDN+LX6GyXYL2ddpE NvqERPHWenjRXoTUJVHZhxMc/x80eGyMHoSLcjzDK2+c2KUhpNLpCH3w/ntmowzIw2590k Qv3kE57vJHnB6QbI/5UUcCI6/Ni4ut8kECeEmpb5sORsGtzmriSLyMd+Yy1CBQ== 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 4TPMq16N41zYbf; Tue, 30 Jan 2024 11:08:29 +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 40UB8TrH076066; Tue, 30 Jan 2024 11:08:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UB8TGQ076063; Tue, 30 Jan 2024 11:08:29 GMT (envelope-from git) Date: Tue, 30 Jan 2024 11:08:29 GMT Message-Id: <202401301108.40UB8TGQ076063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: e95213b35b2c - stable/14 - usb: use only usb_devinfo() in device_set_usb_desc() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e95213b35b2c0662f6cb34ea9b521f6159d78e32 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e95213b35b2c0662f6cb34ea9b521f6159d78e32 commit e95213b35b2c0662f6cb34ea9b521f6159d78e32 Author: Christos Margiolis AuthorDate: 2024-01-16 16:49:08 +0000 Commit: Christos Margiolis CommitDate: 2024-01-30 11:07:29 +0000 usb: use only usb_devinfo() in device_set_usb_desc() device_set_usb_desc() first tries to fetch device information through the iInterface descriptor, otherwise it falls back to usb_devinfo(). Since usb_devinfo() is both guaranteed to work, and is more verbose, get rid of the initial iInterface attempt. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: imp, markj Differential Revision: https://reviews.freebsd.org/D43383 (cherry picked from commit 45cd29412eadbb0e8c40590a94b10663addac17a) --- sys/dev/usb/usb_util.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/sys/dev/usb/usb_util.c b/sys/dev/usb/usb_util.c index f9d50bdefdea..cd2dd7d6039e 100644 --- a/sys/dev/usb/usb_util.c +++ b/sys/dev/usb/usb_util.c @@ -73,9 +73,7 @@ device_set_usb_desc(device_t dev) { struct usb_attach_arg *uaa; struct usb_device *udev; - struct usb_interface *iface; char *temp_p; - usb_error_t err; uint8_t do_unlock; if (dev == NULL) { @@ -88,33 +86,11 @@ device_set_usb_desc(device_t dev) return; } udev = uaa->device; - iface = uaa->iface; - - if ((iface == NULL) || - (iface->idesc == NULL) || - (iface->idesc->iInterface == 0)) { - err = USB_ERR_INVAL; - } else { - err = 0; - } /* Protect scratch area */ do_unlock = usbd_ctrl_lock(udev); - temp_p = (char *)udev->scratch.data; - - if (err == 0) { - /* try to get the interface string ! */ - err = usbd_req_get_string_any(udev, NULL, temp_p, - sizeof(udev->scratch.data), - iface->idesc->iInterface); - } - if (err != 0) { - /* use default description */ - usb_devinfo(udev, temp_p, - sizeof(udev->scratch.data)); - } - + usb_devinfo(udev, temp_p, sizeof(udev->scratch.data)); if (do_unlock) usbd_ctrl_unlock(udev);