From patchwork Thu Jun 5 22:00:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Mayer X-Patchwork-Id: 31438 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 57580203AC for ; Thu, 5 Jun 2014 22:01:45 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id wm4sf6985784obc.10 for ; Thu, 05 Jun 2014 15:01:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=NhBcomEzTzlJJLmTmep/osAjGYAkAWNWGLlk7ZONDqw=; b=CzWA1HUo2P+H266RcqBbdddFG8wUbL4ZTuMFfSfWtVBOz/mg68vT5f1ppliR8YEo1n jGYGZrThounUVhURl7ookMfsQ605G0u1l3JLNiA5t8K9YEQnYdaxNhziiyqrY5PJMWh6 ItNN2yw4O58wVtDrdWR81YcjragYaoF4vot2f7CErjixpvtvuF/H0fJ8AeQloRDeSOdD bjLinsYPAK4eeiHAejqxQKaJOGNNZQqP3CYI9FmmjlUN+m4kBZIxu3THBtMFpeRD/QNn rYPADl7PUswWYvdXGXcfEtEfaPILtT+j4C6hkwdU6iUO2XMrX1BHfxEw+UbjjBME/+9R 8XbQ== X-Gm-Message-State: ALoCoQlDoAzhpictl7PspLSZ+hG3WEIs0Nskz+9K19WfbyG0yFoYxNhzSB50sSns6xvokpuwFRjV X-Received: by 10.50.18.20 with SMTP id s20mr7254648igd.3.1402005704742; Thu, 05 Jun 2014 15:01:44 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.33 with SMTP id e30ls517552qge.89.gmail; Thu, 05 Jun 2014 15:01:44 -0700 (PDT) X-Received: by 10.52.13.98 with SMTP id g2mr616234vdc.46.1402005704592; Thu, 05 Jun 2014 15:01:44 -0700 (PDT) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id su2si4651072vec.27.2014.06.05.15.01.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 05 Jun 2014 15:01:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.182 as permitted sender) client-ip=209.85.128.182; Received: by mail-ve0-f182.google.com with SMTP id sa20so2091305veb.27 for ; Thu, 05 Jun 2014 15:01:44 -0700 (PDT) X-Received: by 10.52.227.138 with SMTP id sa10mr469278vdc.25.1402005704484; Thu, 05 Jun 2014 15:01:44 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp50650vcb; Thu, 5 Jun 2014 15:01:44 -0700 (PDT) X-Received: by 10.68.211.164 with SMTP id nd4mr1060429pbc.44.1402005703708; Thu, 05 Jun 2014 15:01:43 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cc2si15314322pbc.255.2014.06.05.15.01.43; Thu, 05 Jun 2014 15:01:43 -0700 (PDT) Received-SPF: none (google.com: linux-mmc-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752855AbaFEWBS (ORCPT + 6 others); Thu, 5 Jun 2014 18:01:18 -0400 Received: from mail-gw3-out.broadcom.com ([216.31.210.64]:44951 "EHLO mail-gw3-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752797AbaFEWBG (ORCPT ); Thu, 5 Jun 2014 18:01:06 -0400 X-IronPort-AV: E=Sophos;i="4.98,983,1392192000"; d="scan'208";a="32783877" Received: from irvexchcas08.broadcom.com (HELO IRVEXCHCAS08.corp.ad.broadcom.com) ([10.9.208.57]) by mail-gw3-out.broadcom.com with ESMTP; 05 Jun 2014 15:04:15 -0700 Received: from IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.3.174.1; Thu, 5 Jun 2014 15:01:06 -0700 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) with Microsoft SMTP Server id 14.3.174.1; Thu, 5 Jun 2014 15:01:06 -0700 Received: from mail.broadcom.com (lbrmn-lnxub70.ric.broadcom.com [10.136.8.215]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id B198C9FA24; Thu, 5 Jun 2014 15:00:56 -0700 (PDT) From: Markus Mayer To: Chris Ball , Ulf Hansson CC: Tim Kryger , Mike Looijmans , Andrew Bresticker , "Linux MMC List" , Linux Kernel Mailing List Subject: [PATCH v2 2/3] mmc: sdhci: Use existing mmc pointer calling mmc_regulator_set_ocr() Date: Thu, 5 Jun 2014 15:00:04 -0700 Message-ID: <1402005605-24197-3-git-send-email-markus.mayer@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1402005605-24197-1-git-send-email-markus.mayer@linaro.org> References: <1402005605-24197-1-git-send-email-markus.mayer@linaro.org> MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: markus.mayer@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Use the existing "mmc" pointer rather than host->mmc as first argument to mmc_regulator_set_ocr(). Signed-off-by: Markus Mayer Reviewed-by: Matt Porter --- drivers/mmc/host/sdhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index ee524b0..f15720e 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1287,7 +1287,7 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned char mode, if (!IS_ERR(mmc->supply.vmmc)) { spin_unlock_irq(&host->lock); - mmc_regulator_set_ocr(host->mmc, mmc->supply.vmmc, vdd); + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd); spin_lock_irq(&host->lock); } } @@ -1449,7 +1449,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) spin_unlock_irqrestore(&host->lock, flags); if (!IS_ERR(mmc->supply.vmmc) && ios->power_mode == MMC_POWER_OFF) - mmc_regulator_set_ocr(host->mmc, mmc->supply.vmmc, 0); + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); return; }