From patchwork Wed Feb 7 23:59:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Valverde X-Patchwork-Id: 10206351 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8C5CE601BE for ; Thu, 8 Feb 2018 00:00:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D2DD2916C for ; Thu, 8 Feb 2018 00:00:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71CB42919D; Thu, 8 Feb 2018 00:00:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, HK_RANDOM_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0ABD029178 for ; Thu, 8 Feb 2018 00:00:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751039AbeBHAA2 (ORCPT ); Wed, 7 Feb 2018 19:00:28 -0500 Received: from mail-ua0-f196.google.com ([209.85.217.196]:33929 "EHLO mail-ua0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750899AbeBHAA1 (ORCPT ); Wed, 7 Feb 2018 19:00:27 -0500 Received: by mail-ua0-f196.google.com with SMTP id g5so1773735uac.1; Wed, 07 Feb 2018 16:00:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=K4r8qia8bMgrPaIaeP7zheqjq/XpQ+xRup7b0Yq2IXA=; b=GPsdmT+WidM5F4Kz/i3YgYr+VgP7T5rWihqrv/Lo/la3QutNiGFdb8K32tzTn1DDCe QiSHJHqU6nCXjXa3BRYpLjeSYCVhGYRzDtwRfSCJITeB5Z7Dr7mnH8Jv3ihrRoS/IM2H 3DkYwR+pPh9Lfaaj7kVkDB1qCzsmGaG3E3SB5sTHomRhDxp0/+aF6J+GnhFXIDSeEPn/ 4wIf75o7WBFQkQFsM7nxmThGp7a3mkuNtejU+IWIM8QePMhKcYGJshZ1v1CmiQ/io3Z1 PU39dPPPLipPn+rgKwjNUAGA4NkU8wWSO+IuCRdXO0DHE7aG2tGkzwbHAVPyB7s6zfa0 Qlbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=K4r8qia8bMgrPaIaeP7zheqjq/XpQ+xRup7b0Yq2IXA=; b=GZgxv/aFiJ3qf8pRwcSM+tdQ/QtwVA1okwXalH20CcDTBlXUryZoddOJ3Ue8EJxcx9 UtyRXydg+waNG3XdtzO/2uEqCi8i1rtgLozATiiPN/Tzmn4C9AA9m+JWs+kYgrHdf4Y4 p/9GMJnjVUThG5l1gzkRPm+5W90QV+HQX51l4W1xZTPiKwZ6IAlFMdiWtztNNkGWWMuE Zo9d6rWNX0CZGoJq2cGnLIWSY1nAL7KHQe7WBobiHZRtV9aFTwpCsm46FVr2AJQ4GwcG H/E5kqAmYKeK4M9kfSGGssbLIOic+W0BNCmyDAk+IZIs27BgZKYVEz74fn/TUt2Qj3aA AHww== X-Gm-Message-State: APf1xPByp980nr6gSy3nSLo6QC+KbcU5vCGNXAG1VYaSptMLa1KfOcuW XcqOo8hM8F5HeTw2MyinaUk= X-Google-Smtp-Source: AH8x226+V9c9+/LUzJVq8jGk8dm9GvvbFSvb+1UNWYHZzxIaZI5THO+LeDBw3OVgMsoG7b9ISaVKRw== X-Received: by 10.159.60.8 with SMTP id u8mr7130563uah.156.1518048026368; Wed, 07 Feb 2018 16:00:26 -0800 (PST) Received: from localhost.localdomain ([201.191.199.188]) by smtp.gmail.com with ESMTPSA id u5sm2438011uaf.7.2018.02.07.16.00.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Feb 2018 16:00:25 -0800 (PST) From: Sergio Valverde Cc: Sergio Valverde , Ulf Hansson , Linus Walleij , Shawn Lin , Adrian Hunter , Bartlomiej Zolnierkiewicz , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] mmc: core: optimize mmc_calc_max_discard Date: Wed, 7 Feb 2018 17:59:40 -0600 Message-Id: <1518047981-23958-1-git-send-email-vlvrdv@gmail.com> X-Mailer: git-send-email 2.7.4 To: unlisted-recipients:; (no To-header on input) Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the max_discard value is zero, the conditional branch that checks the trim capabilities will never update this value with max_trim. Change the condition statement to also check the max_discard value in order to avoid an unnecessary call to mmc_do_calc_max_discard. Signed-off-by: Sergio Valverde --- drivers/mmc/core/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 1f0f44f..97856b1 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2567,7 +2567,7 @@ unsigned int mmc_calc_max_discard(struct mmc_card *card) return card->pref_erase; max_discard = mmc_do_calc_max_discard(card, MMC_ERASE_ARG); - if (mmc_can_trim(card)) { + if (mmc_can_trim(card) && max_discard) { max_trim = mmc_do_calc_max_discard(card, MMC_TRIM_ARG); if (max_trim < max_discard) max_discard = max_trim;