From nobody Tue Mar 11 02:34:51 2025 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 4ZBdBz6JFBz5qXyB; Tue, 11 Mar 2025 02:34:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZBdBz5h6pz460w; Tue, 11 Mar 2025 02:34:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741660491; 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=NKMnqA4BgHX0aXCmatPqnWzD0H2cXzjq6ICc9XFhBek=; b=sswXlsFHyvu+jqlEfotHsFpud6ONaG+uFOJsuBTj2V1R5B43BzGlXBpxe0GdAdWao9nVFn Q8HJ0SB3ksEBJhYMAWsySuZoZr3eCpHA7mMEAuvlt1h/uDRSyeBFIGm5u5FFzbSYYSogra zaSCrguFbooK+LLpjozKuN3riqG3rqRhQJD47xJPUMG+cNHSoxwr/eLV1ynoYXU76RGnoN SCtNSJEreryqj1/qS3xSullUu5sB+BQWAHD3sbLeoVUYq0QBZXV7ZgtBuDxOXKX4WMTYuS 11dxK3eZj0MRzcU3wWovhraO0Z2HYAWNjQU+wj7S9pc/U+lY+rNistCfiN+WoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741660491; a=rsa-sha256; cv=none; b=g5x03qyBmIuOAy48tV4+Zz+4Zu/ZkfZK5mklMd5qGh3r54wHVd3S2QkkXD5zFBgVfRn6zf /vihdc20MPoU9Layj7maw2lusLv+djbCzd+QAFmyZlrj+hU2ps/WEwzfWEi5/K3GGCKyXg UXAlYUpRU7DPUrf8i4J0VyyEgNfEQf/eqgvQcAUJ6nLVVzJRqbMj2oc6suJZe11aoAOKS5 vhrX2Ruxrbx+HcsTZJp71sy8/QpVe+Wvi5FubGkvS9IyJB3dbBCDj5BOLnBAFhsS4HpS1q LuOTnvS8Q5etDsxnaLHiqNBDh9CxstyFbVGCe9/qhE1JbKUVZbnGds87PNoZAg== 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=1741660491; 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=NKMnqA4BgHX0aXCmatPqnWzD0H2cXzjq6ICc9XFhBek=; b=quuZzY8uIQeKjeB9lNmGz6QkKFMwYPobE+QrV5/iHFuwTpCUiDlBeaDPzIxieR1jgWUQSX 3MCx9UfKFgso3bIYlABIJSAjPRTfnC9OHshzcfLFthsnClBQJdOxr++TuMgqWgwVRYbFKw JgMisb4hRNjApyvhXonR8emf8thcGsAPCQRbkvIKy5B+iesqXkiRMt0o6k/HttnnX3mObt 4b6lEE2+IDXyrm+0w0k7dgFgHxqqF79Wgzjd9OK6qakwyCkz6O+af4iH2VZCsWdzsGF6Vf xdTIN1ftYL9K0EdoW/OjK6CcS3amq5dZyiuigb21yztniUhi+X+6lxG/5fRJUg== 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 4ZBdBz54PQz15nX; Tue, 11 Mar 2025 02:34:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52B2Yp0u036921; Tue, 11 Mar 2025 02:34:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52B2Yp3o036918; Tue, 11 Mar 2025 02:34:51 GMT (envelope-from git) Date: Tue, 11 Mar 2025 02:34:51 GMT Message-Id: <202503110234.52B2Yp3o036918@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 048d6ca31d96 - main - umass: Remove some 20-year-old dead code 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 048d6ca31d968a79cfcde30295eff475582b1915 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=048d6ca31d968a79cfcde30295eff475582b1915 commit 048d6ca31d968a79cfcde30295eff475582b1915 Author: Warner Losh AuthorDate: 2025-03-10 20:46:48 +0000 Commit: Warner Losh CommitDate: 2025-03-11 02:33:15 +0000 umass: Remove some 20-year-old dead code A REQUEST SENSE CDB was just copied into the cmd buffer, so testing for INQUIRY will always fail. Remove the dead code. This code was added, apparently by mistake in 2003. 8541fbec7900e merged changes from NetBSD's umass_scsipi.c 1.8 to address some BBB bulk-in clear problems. NetBSD had fixed a problem in the FORCE_SHORT_INQUIRY quirk code they had ported from FreeBSD that FreeBSD also needed. That merge also included the dead code, which was not in NetBSD. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D49311 --- sys/dev/usb/storage/umass.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index 58f36e756dce..3e5cc9a7e084 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -2523,10 +2523,6 @@ umass_cam_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue, if (umass_std_transform(sc, ccb, &sc->cam_scsi_sense.opcode, sizeof(sc->cam_scsi_sense))) { - if ((sc->sc_quirks & FORCE_SHORT_INQUIRY) && - (sc->sc_transfer.cmd_data[0] == INQUIRY)) { - ccb->csio.sense_len = SHORT_INQUIRY_LENGTH; - } umass_command_start(sc, DIR_IN, &ccb->csio.sense_data.error_code, ccb->csio.sense_len, ccb->ccb_h.timeout, &umass_cam_sense_cb, ccb);