From patchwork Thu Feb 8 17:41:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Valverde X-Patchwork-Id: 10207571 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 D6CD1602D8 for ; Thu, 8 Feb 2018 17:43:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C6F2F2959F for ; Thu, 8 Feb 2018 17:43:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BBABA295A5; Thu, 8 Feb 2018 17:43:35 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_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 4FAE02959F for ; Thu, 8 Feb 2018 17:43:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751984AbeBHRne (ORCPT ); Thu, 8 Feb 2018 12:43:34 -0500 Received: from mail-ua0-f196.google.com ([209.85.217.196]:44050 "EHLO mail-ua0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751756AbeBHRnd (ORCPT ); Thu, 8 Feb 2018 12:43:33 -0500 Received: by mail-ua0-f196.google.com with SMTP id x4so3409107uaj.11; Thu, 08 Feb 2018 09:43:33 -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:in-reply-to:references; bh=gfjqENWGHZ8JthiooXi20yHXzDj19nXWpSXc6bRDQSM=; b=tSobhTXdRe1oVNRuEdfKxQJXmEFu1athBrQZzCxfUCHwadIfNuRCDDzdmfn63P6lcx 5tVYA7up5V8FiRkaQ4v58XQ3Aa5dGm8Gc7uGy1K5tKEHX4fO9HHK+6QuO5npjsTKXlKd +xtMFjxStl8noC04iwUjKjAhEipAhKZQSqoaIJwRXGgbSoFXBH5Nowqjhewh/wntIuza LN7NccopJRiCAJ3GL8lo8pCs1l3HHHjxzb087H/phIRCVPJxVCYmyo9c20j0z32HPHQf Y5bHgsSRu4vs03QtkiQDvz/9hgL2+iRu/zQ7C5In++ORHl5HiGEUH8AnGpSjsS6JeE4o q37w== 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:in-reply-to :references; bh=gfjqENWGHZ8JthiooXi20yHXzDj19nXWpSXc6bRDQSM=; b=d7KHc0MwVKjD+biu5dNmL1tYLaggiferNtUiWNfHLjKEQpke2yKcac8+IfhdWQiewk A90Lp/CLv2juRRDPOgXvmWHZm8u4Ir8Hyf40J8BFKy+kSl5ZVET4scpirji294Okxqr6 clY3HGAm5iRvMIjEjLgonrAACiz4mBB/SEa3FZO+l+wIBU5rr6V1fd8HYvdNOrvKhNZM wmSb2b76LKzdfQcRA/BUjBXfM6hDty5BQ9olHNAC9rrtPs+iDHlzPLRnJf0261YszLT4 T1fKwtvhpzW9oBrzUD4cVsouoZ2MuQjtAKr+H83Fc4eA+GxtCE4ZjlfzY+uMg23iHrXD h7Fw== X-Gm-Message-State: APf1xPDuNV6cN5mCWXn8AOl2/esupVF8YlqhFK+g1q4Wbbl5wS/zDyHx wP2yWp+IWWqB0Ek3XHYTNF4= X-Google-Smtp-Source: AH8x224HRzeNTBBk75JrY3IIHdO8zo+uU6S0MX9i2POdXIWQ9TyBB+cR5Nc21ryqKAs7gHZnnTxBqQ== X-Received: by 10.176.73.77 with SMTP id a13mr1176378uad.165.1518111812735; Thu, 08 Feb 2018 09:43:32 -0800 (PST) Received: from localhost.localdomain ([201.191.199.65]) by smtp.gmail.com with ESMTPSA id 43sm71695uaj.4.2018.02.08.09.43.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Feb 2018 09:43:32 -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 v2] mmc: core: optimize mmc_calc_max_discard Date: Thu, 8 Feb 2018 11:41:43 -0600 Message-Id: <1518111705-11122-1-git-send-email-vlvrdv@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518047981-23958-1-git-send-email-vlvrdv@gmail.com> References: <1518047981-23958-1-git-send-email-vlvrdv@gmail.com> 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 Reviewed-by: Shawn Lin --- Changes in v2: - Evaluate max_discard to avoid unnecessary calls to mmc_can_trim. 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..c32c0f4 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 (max_discard && mmc_can_trim(card)) { max_trim = mmc_do_calc_max_discard(card, MMC_TRIM_ARG); if (max_trim < max_discard) max_discard = max_trim;