From patchwork Thu Jun 8 13:27:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 9774745 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 E721960393 for ; Thu, 8 Jun 2017 13:28:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D981D28451 for ; Thu, 8 Jun 2017 13:28:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE41428520; Thu, 8 Jun 2017 13:28:10 +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_SIGNED, 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 69B9E28451 for ; Thu, 8 Jun 2017 13:28:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752115AbdFHN2H (ORCPT ); Thu, 8 Jun 2017 09:28:07 -0400 Received: from mail-lf0-f45.google.com ([209.85.215.45]:33446 "EHLO mail-lf0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752097AbdFHN2D (ORCPT ); Thu, 8 Jun 2017 09:28:03 -0400 Received: by mail-lf0-f45.google.com with SMTP id a136so18053591lfa.0 for ; Thu, 08 Jun 2017 06:28:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=61hvngFNBmID7dK9WxOaB7kPPIqB9HXMtO7V4mrOmkM=; b=KQxXyl4jtnsH/FSl6JtIVcNXi97gpv/Pj1Q0/giViy72OYHmg2Zm4ZlAdbMKxp+zjz wafUI0tgLk1CsLwUUY2Wc/Dv8S7pScF2tdK6BHsXDvy+Ea8abYFvOpHw/4uKwGIsucTd R+ltFKTqwGERXnNUdnm87gV2bT5H7ibrPb+CU= 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=61hvngFNBmID7dK9WxOaB7kPPIqB9HXMtO7V4mrOmkM=; b=NIXKB5N/FO2THKWFeHr6zkbfINzhAXz9lriY7S3bwh7pOKXwy+mxH1IBipnrLQcy+i z2VHfxdz9WJYMdsv/aKi34M3CjVGUdiX9j1+Xtsnib0TiQA+paV4SHILHUgtNcIINejW P6ymtFa1DvuxyPqP4QWS4qiP4atI7bVIAAH0zt3eAogK4lf4wUGBGoxdK8CNt2g4BqzO qv17qYrVVogX+vAxglqfgjnwassDFcF3gtj3g0C3W+BKbhJ+xuIXiefrU4Rdy6SHkN9x 29vJt4a0tdP2ot/7gLxBCXRrKuR/EZv9MevSODMufGc7ju8KMJixSeG/Yw/N5j5iHjY1 G9LA== X-Gm-Message-State: AODbwcD3f53yAls6vG1Vvy+4k53b8fyBpENK4z/zKqRUpGS7i2REMmc6 Ds9ZUu2YcorduCfNlDXVLA== X-Received: by 10.46.20.81 with SMTP id 17mr7553920lju.111.1496928481740; Thu, 08 Jun 2017 06:28:01 -0700 (PDT) Received: from uffe-XPS-13-9360.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id i8sm1025178ljb.55.2017.06.08.06.28.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Jun 2017 06:28:01 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Jaehoon Chung , Adrian Hunter , Linus Walleij Subject: [PATCH 9/9] mmc: core: Clarify code for sending CSD Date: Thu, 8 Jun 2017 15:27:45 +0200 Message-Id: <1496928465-25004-10-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496928465-25004-1-git-send-email-ulf.hansson@linaro.org> References: <1496928465-25004-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-Virus-Scanned: ClamAV using ClamSMTP To make the code more consistent and to increase readability, add an mmc_spi_send_csd() function, which gets called from mmc_send_csd() in case of SPI mode. Signed-off-by: Ulf Hansson Reviewed-by: Linus Walleij --- drivers/mmc/core/mmc_ops.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index b60b4da..5f051ea 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -291,15 +291,11 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host, return 0; } -int mmc_send_csd(struct mmc_card *card, u32 *csd) +static int mmc_spi_send_csd(struct mmc_card *card, u32 *csd) { int ret, i; __be32 *csd_tmp; - if (!mmc_host_is_spi(card->host)) - return mmc_send_cxd_native(card->host, card->rca << 16, - csd, MMC_SEND_CSD); - csd_tmp = kzalloc(16, GFP_KERNEL); if (!csd_tmp) return -ENOMEM; @@ -316,6 +312,15 @@ int mmc_send_csd(struct mmc_card *card, u32 *csd) return ret; } +int mmc_send_csd(struct mmc_card *card, u32 *csd) +{ + if (mmc_host_is_spi(card->host)) + return mmc_spi_send_csd(card, csd); + + return mmc_send_cxd_native(card->host, card->rca << 16, csd, + MMC_SEND_CSD); +} + static int mmc_spi_send_cid(struct mmc_host *host, u32 *cid) { int ret, i;