From patchwork Wed Feb 8 15:11:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 54460 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3519437wrn; Wed, 8 Feb 2023 07:29:31 -0800 (PST) X-Google-Smtp-Source: AK7set8+47psbWzZgvMm9XgHKDQwWELFUv5JQjLkLHjNxmooN/1oVU5yoNbMwURxkgX16wO7Am7u X-Received: by 2002:a05:6402:34cc:b0:491:6ea2:e88a with SMTP id w12-20020a05640234cc00b004916ea2e88amr8394992edc.2.1675870171003; Wed, 08 Feb 2023 07:29:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675870170; cv=none; d=google.com; s=arc-20160816; b=Aa+rGkMrE70hB/uhdpMskQJHOHiqiL9qZPCdw7tE7raLJJk3hPMao059PdtgWzwP5n 5F/emQnniQ/76utfAv8KIJYJ8bsL5f16Yr69PHVJRiPCkItq/oR/bPk8keyNMmjtrQ5/ j/wURNOauaOWFOXSYw3RU3JmHcXMjHH8mWaaMG54IJInEPUrHpPYXecPbLRD1XqEXBg/ CbFNSpU2yuTXG1QA26T4JB/3naJiTWn0TiaQJuGAh9dyPqPW9Ee+9s3SoUanqlcsPKFW yOhxPPqLlRjZrjNxXJjbuwTZT2IhvHHzqFX5+KTZuUl/e74xZf7bjzGaW9O8aKifknJv jrtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xcV3jwANThwGE2IXrNAE9SOxAB+uZ9KJ7pj5PPXQhm4=; b=xRq+Kdk7j3yAnJn+MV3EXRYuhm+DjmatLGT9xsRodbJ4nYcfAAomwofDEx8H6T8e3x OgmZrUA4c6bv1+aSLESw7nM9X3rsKxXLcwBqHk6tpPzzLKw/+x19lu3bgq5J1uitM4ON UtQMkrYfLo76vsQNa4SPNORcyOz5ziLPbiiS9KzFsZnRo60rbJ8Wbmf9bFU4deRhXV0E vJvEfeXL8Oe+5CztKm2jUoXQ9zQ6axETcOi7/FYTMsPKT0iknEh5bnhU3PyqspZ7UCK6 +hjh01mtQ+VaonSK41d17qp46YvCzGJCtP2U26DWZwDYNMACHeRxGEWjrCK94hqfDDvm 6UdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Sw+FwS4q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fm23-20020a1709072ad700b0087882488de2si17595717ejc.391.2023.02.08.07.28.58; Wed, 08 Feb 2023 07:29:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Sw+FwS4q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231806AbjBHPQH (ORCPT + 99 others); Wed, 8 Feb 2023 10:16:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231744AbjBHPQC (ORCPT ); Wed, 8 Feb 2023 10:16:02 -0500 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 304A73A599; Wed, 8 Feb 2023 07:16:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675869362; x=1707405362; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7Sgb1zaNMokHswRtSrmPc/gbS71Ao7WxNEkQZZyyfeI=; b=Sw+FwS4qZKtzSQGXhg1LP56n8Zwpug/UUZsZxXZy6oztrT6cqo9/nFdZ t3GNfut5LczrCJBpi6kN/qR6epmN619WEraQ4gwEt6/1NytvXut050jfq BFON5yFEwkW83idtXPEJSS8SF7UmcV67WA/BKlmI8kBen0Ls/El1Vbfpc EpLJemM3Z9h/1r2o8uKOoZfeGzOUTMKbRsGvUw23v0mMAXs1D1HLxGf1P H2RSpQCAPjB3wESMxNRnhU3w9th6vKMEwAAYXSe6y6/uHD/lCcqp+//Sr 7D5JaUKMhYFdqV57SvngDXzpqtUTfOBGDlr9TrhOPDxVtFRFIjtTYG2m2 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10615"; a="317825120" X-IronPort-AV: E=Sophos;i="5.97,281,1669104000"; d="scan'208";a="317825120" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2023 07:10:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10615"; a="776061112" X-IronPort-AV: E=Sophos;i="5.97,281,1669104000"; d="scan'208";a="776061112" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 08 Feb 2023 07:10:52 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id EA1C9210; Wed, 8 Feb 2023 17:11:30 +0200 (EET) From: Andy Shevchenko To: Mathias Nyman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mathias Nyman , Greg Kroah-Hartman , Andy Shevchenko Subject: [PATCH v2 3/7] xhci: mem: Get rid of redundant 'else' Date: Wed, 8 Feb 2023 17:11:25 +0200 Message-Id: <20230208151129.28987-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230208151129.28987-1-andriy.shevchenko@linux.intel.com> References: <20230208151129.28987-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757277240122691629?= X-GMAIL-MSGID: =?utf-8?q?1757277240122691629?= In the snippets like the following if (...) return / goto / break / continue ...; else ... the 'else' is redundant. Get rid of it. While at it, make if-chain sorted from testing bigger values to smaller. Signed-off-by: Andy Shevchenko --- drivers/usb/host/xhci-mem.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index 4ffa6495878d..357883256a5a 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -572,14 +572,11 @@ static struct xhci_stream_ctx *xhci_alloc_stream_ctx(struct xhci_hcd *xhci, size_t size = size_mul(sizeof(struct xhci_stream_ctx), num_stream_ctxs); if (size > MEDIUM_STREAM_ARRAY_SIZE) - return dma_alloc_coherent(dev, size, - dma, mem_flags); - else if (size <= SMALL_STREAM_ARRAY_SIZE) - return dma_pool_zalloc(xhci->small_streams_pool, - mem_flags, dma); + return dma_alloc_coherent(dev, size, dma, mem_flags); + if (size > SMALL_STREAM_ARRAY_SIZE) + return dma_pool_zalloc(xhci->medium_streams_pool, mem_flags, dma); else - return dma_pool_zalloc(xhci->medium_streams_pool, - mem_flags, dma); + return dma_pool_zalloc(xhci->small_streams_pool, mem_flags, dma); } struct xhci_ring *xhci_dma_to_transfer_ring( @@ -1399,8 +1396,9 @@ static u32 xhci_get_max_esit_payload(struct usb_device *udev, if ((udev->speed >= USB_SPEED_SUPER_PLUS) && USB_SS_SSP_ISOC_COMP(ep->ss_ep_comp.bmAttributes)) return le32_to_cpu(ep->ssp_isoc_ep_comp.dwBytesPerInterval); + /* SuperSpeed or SuperSpeedPlus Isoc ep with less than 48k per esit */ - else if (udev->speed >= USB_SPEED_SUPER) + if (udev->speed >= USB_SPEED_SUPER) return le16_to_cpu(ep->ss_ep_comp.wBytesPerInterval); max_packet = usb_endpoint_maxp(&ep->desc);