From patchwork Tue Oct 21 17:19:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 5126611 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C5D9A9F387 for ; Tue, 21 Oct 2014 17:19:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0AE802021A for ; Tue, 21 Oct 2014 17:19:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 37F642020F for ; Tue, 21 Oct 2014 17:19:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933190AbaJURTn (ORCPT ); Tue, 21 Oct 2014 13:19:43 -0400 Received: from mail-lb0-f171.google.com ([209.85.217.171]:50600 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933163AbaJURTm (ORCPT ); Tue, 21 Oct 2014 13:19:42 -0400 Received: by mail-lb0-f171.google.com with SMTP id z12so1432517lbi.30 for ; Tue, 21 Oct 2014 10:19:38 -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=B/xpYCZkaPKUJ/gcYwaH6MBJKFX7CUFZCZ9epJ2otX8=; b=NQpAFF8harqf76nBoJJSEAoJzzw/WDBalfcSS0Xzf2vxe/hJ6ueTpwRLN2MsKcqNMS w/dH7dgN+QoskY83zsdFxcWP9OGfo3LQSm5q+ch7hQk4jFK7FKmWgZ0jCsSFKRPgy82+ MsLTsTpy4wbIIpLU1roHoev/VY7pVNigOx3Gzu3ljvLt273wxVmELlOtriI8UNQfVMgP 7+0CNxjQU7+yM8S8FkypnjJj5v9Hp1RaVdRbFtpCjmtQpsnFSr1ue/ceaR3u+Ih5cA4h XyHKpR90+AQFPLcv442z0aHrgeRQBbwzghcocMBmbq/ULi6ZwXfqtOMYXDUmrip3cD+n SsSg== X-Gm-Message-State: ALoCoQkL3x4Z7N2cL8apFsx8tQbbBVkPtpcGkUrSVtEjpZLIYzJfWBBs22gJ9CVH4OaaC0otlFyY X-Received: by 10.112.254.162 with SMTP id aj2mr36735574lbd.70.1413911978843; Tue, 21 Oct 2014 10:19:38 -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.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Oct 2014 10:19:37 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson , Chris Ball Subject: [PATCH 11/15] mmc: block: Use mmc_get_ext_csd() instead of mmc_send_ext_csd() Date: Tue, 21 Oct 2014 19:19:09 +0200 Message-Id: <1413911953-19012-12-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/card/block.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 1fa4c80..1795285 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1308,19 +1308,11 @@ static int mmc_blk_packed_err_check(struct mmc_card *card, } if (status & R1_EXCEPTION_EVENT) { - ext_csd = kzalloc(512, GFP_KERNEL); - if (!ext_csd) { - pr_err("%s: unable to allocate buffer for ext_csd\n", - req->rq_disk->disk_name); - return -ENOMEM; - } - - err = mmc_send_ext_csd(card, ext_csd); + err = mmc_get_ext_csd(card, &ext_csd); if (err) { pr_err("%s: error %d sending ext_csd\n", req->rq_disk->disk_name, err); - check = MMC_BLK_ABORT; - goto free; + return MMC_BLK_ABORT; } if ((ext_csd[EXT_CSD_EXP_EVENTS_STATUS] & @@ -1338,7 +1330,6 @@ static int mmc_blk_packed_err_check(struct mmc_card *card, req->rq_disk->disk_name, packed->nr_entries, packed->blocks, packed->idx_failure); } -free: kfree(ext_csd); }