From nobody Wed May 7 21:37:09 2025 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 4Zt7rk3j5Wz5vKp0; Wed, 07 May 2025 21:37:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt7rj21ZJz3lnB; Wed, 07 May 2025 21:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653829; 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=wUVLlvGUk1uOXcU21KcMqS+IIM98qoqjZq8OJYMcF/Q=; b=v/JhIPED3DluiPvVnJP0Ht6n4nzA/oqwHPkT73YM4LHz0oxmhaT4TbJ0CySAzWRSp5T5ST jwLnz/sCLoy03fytTfNCrjDmRuBw+sWJ7MnPSZzRGYLF5tl+7LK9U/lnL0Gw7zdxNS34LX +yM04KNcIB01EmdbTe6v8ujDS5cK7TlERcgXMK4rGdVBoOrKTGuK4OotyMOfBrH3ZnMy0L ZXe1u1b+gsPV7es6t+Vx1Qi8eeCWV7TJWu85tvCdOD5cltRFjJ2Zwn+2zMZEo+ZOo97NtC 050s/5E/++0SlVBbqqxQ7d23769JxYzkjyq8UnzpdzzNWmDuHwgBPLdfxPyRDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653829; 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=wUVLlvGUk1uOXcU21KcMqS+IIM98qoqjZq8OJYMcF/Q=; b=GeDasjgjuub+mP9utQ276rtZc0t7bfG3VfZ7ydNPFcn+cjd05zi1Ms+rWg5db/tGARO2JD jg6lyqmikNXdxectyNvg4+/JGNQI/wt/L+RR0pgZDjwVeRlU27ij2R+84I8UZio8T1zx9A 1CjNbZuLWisPA80t4GYrjbimwka1ofE+oAwwlkuucOFohdd6kVRvRQnEVoDQf0FYbCII78 pjgm0xxvDIYeMjEJaCICXwnJ85uWOnDQrKdwXJ5s9R5IDzG9TeCRnQsFqiFvv/06gSTd3n MUTD9tDH15hZtUn9mtXZQr54ZoLnSrxNLvcPm+xKgyhvHsERsJ/5uQvmysw7Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746653829; a=rsa-sha256; cv=none; b=J/jUvHcPBDjpDWaQDnmrLOUu8L7KMu9UV3A9Y15V6LmUXPda4DcuSbUxRztssG2HgPfiEN 66C3sl7PDxHpvaC5EltoO3mMEaFPPHjcMS2BM5kOTtUEaEhN6MwnYEkKMBRFjfpoFFJvI2 7KHLcFqp4+MMci5qz+03ytjEVm5ZtSR3s2UFVQYZ6htmllCBkVhL71WuaiW7NrAviyWy6+ vwsFZ5w4UPwHdu94vUhLPtCOBhrDlgTON7fximQwNY5ZlvmRZjmRdHriK1r6M8vkWifeYZ uUfPPbYguUb536VLoHXcecCZ1JfsvhJIvE+yX1NzoWX64Mg8MvA20BG9Ea00Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zt7rj1Ty5zmvK; Wed, 07 May 2025 21:37:09 +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 547Lb9Gf092057; Wed, 7 May 2025 21:37:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547Lb9HP092054; Wed, 7 May 2025 21:37:09 GMT (envelope-from git) Date: Wed, 7 May 2025 21:37:09 GMT Message-Id: <202505072137.547Lb9HP092054@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: 49633d5d02e1 - main - umass: Simplify umass_std_transform to eliminate fake success 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 49633d5d02e1c6cea718d0581974d614534019c8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=49633d5d02e1c6cea718d0581974d614534019c8 commit 49633d5d02e1c6cea718d0581974d614534019c8 Author: Warner Losh AuthorDate: 2025-05-07 16:07:22 +0000 Commit: Warner Losh CommitDate: 2025-05-07 21:36:54 +0000 umass: Simplify umass_std_transform to eliminate fake success Now that nothing returns (2) to fake the success of the command, eliminate that magic number by eliminating the case. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D49469 --- sys/dev/usb/storage/umass.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index bdbe04ce3bbd..9878635f7e59 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -2949,20 +2949,13 @@ umass_std_transform(struct umass_softc *sc, union ccb *ccb, { uint8_t retval; - retval = (sc->sc_transform) (sc, cmd, cmdlen); + if (sc->sc_transform(sc, cmd, cmdlen)) + return (1); /* Execute command */ - if (retval == 2) { - ccb->ccb_h.status = CAM_REQ_CMP; - xpt_done(ccb); - return (0); - } else if (retval == 0) { - xpt_freeze_devq(ccb->ccb_h.path, 1); - ccb->ccb_h.status = CAM_REQ_INVALID | CAM_DEV_QFRZN; - xpt_done(ccb); - return (0); - } - /* Command should be executed */ - return (1); + xpt_freeze_devq(ccb->ccb_h.path, 1); + ccb->ccb_h.status = CAM_REQ_INVALID | CAM_DEV_QFRZN; + xpt_done(ccb); + return (0); /* Already failed */ } #ifdef USB_DEBUG