From patchwork Tue Oct 21 17:19:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 5126621 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DCA33C11AC for ; Tue, 21 Oct 2014 17:19:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 020D42020F for ; Tue, 21 Oct 2014 17:19:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1671F20220 for ; Tue, 21 Oct 2014 17:19:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933208AbaJURTo (ORCPT ); Tue, 21 Oct 2014 13:19:44 -0400 Received: from mail-la0-f42.google.com ([209.85.215.42]:38333 "EHLO mail-la0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933185AbaJURTn (ORCPT ); Tue, 21 Oct 2014 13:19:43 -0400 Received: by mail-la0-f42.google.com with SMTP id gf13so1653101lab.1 for ; Tue, 21 Oct 2014 10:19:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=pN2YLkBfLAT0GMHETIKfzgjyjZzZm9cXFJVl+HKkzY0=; b=mPc6fGugvU7YddC6w1dk9/RP3pVHR2/usxoFhwNasv+xyiWTW4tsU/1KPOaXH5V4o3 Km79xT4OJoounUH22iXwfMEt7Py1laLkda/RbAr7mtY3G5DrS9oEviXKu2PRGEzsC8bQ HGjT8qDNgMKsVPbk99HRdRda3IjNk87FE/FVQ1JzYWHLpNf7wuh1l8AfCZVL8Z9+lCPx ftuJ60xtJtJ1ePKxV2A9BcaFgVm+2ZhyItbmh2LFe90G63CGhf7uGBsrSlwaV9Y/jOzk ilRl8N1GqA6b78SNsuMJm8Ks8OzZ6mQGt3dFxn1MO5rO0zEc/zp3Vs7/ACEMHN8ulr6C Ozyw== X-Gm-Message-State: ALoCoQnw+eUZx9ddj9SQUpSi+u8wuxfltFFGXZfjMHLrG4eWQ/Jl10x0SMsc2IQeC1G5+dprTLFJ X-Received: by 10.112.41.168 with SMTP id g8mr35646524lbl.59.1413911980738; Tue, 21 Oct 2014 10:19:40 -0700 (PDT) Received: from uffe-Latitude-E6430s.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id uh7sm4791085lac.1.2014.10.21.10.19.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Oct 2014 10:19:39 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson , Chris Ball Subject: [PATCH 12/15] mmc: core: Use mmc_get_ext_csd() instead of mmc_send_ext_csd() Date: Tue, 21 Oct 2014 19:19:10 +0200 Message-Id: <1413911953-19012-13-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413911953-19012-1-git-send-email-ulf.hansson@linaro.org> References: <1413911953-19012-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP By using mmc_get_ext_csd() in favor of mmc_send_ext_csd, we decrease code duplication. Signed-off-by: Ulf Hansson --- drivers/mmc/core/core.c | 17 +++-------------- drivers/mmc/core/debugfs.c | 9 +-------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index f26a5f1..4b9fe01 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -709,27 +709,16 @@ int mmc_read_bkops_status(struct mmc_card *card) int err; u8 *ext_csd; - /* - * In future work, we should consider storing the entire ext_csd. - */ - ext_csd = kmalloc(512, GFP_KERNEL); - if (!ext_csd) { - pr_err("%s: could not allocate buffer to receive the ext_csd.\n", - mmc_hostname(card->host)); - return -ENOMEM; - } - mmc_claim_host(card->host); - err = mmc_send_ext_csd(card, ext_csd); + err = mmc_get_ext_csd(card, &ext_csd); mmc_release_host(card->host); if (err) - goto out; + return err; card->ext_csd.raw_bkops_status = ext_csd[EXT_CSD_BKOPS_STATUS]; card->ext_csd.raw_exception_status = ext_csd[EXT_CSD_EXP_EVENTS_STATUS]; -out: kfree(ext_csd); - return err; + return 0; } EXPORT_SYMBOL(mmc_read_bkops_status); diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c index 91eb162..e914210 100644 --- a/drivers/mmc/core/debugfs.c +++ b/drivers/mmc/core/debugfs.c @@ -291,14 +291,8 @@ static int mmc_ext_csd_open(struct inode *inode, struct file *filp) if (!buf) return -ENOMEM; - ext_csd = kmalloc(512, GFP_KERNEL); - if (!ext_csd) { - err = -ENOMEM; - goto out_free; - } - mmc_get_card(card); - err = mmc_send_ext_csd(card, ext_csd); + err = mmc_get_ext_csd(card, &ext_csd); mmc_put_card(card); if (err) goto out_free; @@ -314,7 +308,6 @@ static int mmc_ext_csd_open(struct inode *inode, struct file *filp) out_free: kfree(buf); - kfree(ext_csd); return err; }