From patchwork Thu Jun 5 22:00:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Mayer X-Patchwork-Id: 31437 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f199.google.com (mail-ve0-f199.google.com [209.85.128.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 33F8D203AC for ; Thu, 5 Jun 2014 22:01:44 +0000 (UTC) Received: by mail-ve0-f199.google.com with SMTP id oz11sf8422876veb.10 for ; Thu, 05 Jun 2014 15:01:43 -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=GhyaBbJFD6IlposJMhLrIwQJkf06jb6IqibtNmfevvU=; b=ESJVDH2huOcQeGqYyQ7cubOmCU7P3CiO0t7FcF3x9LWboqt2HMzwJ4lrPSrCfXSwet bIcR6Jyam8ovmJIWoHPdYHSaKQWzEhw8Fx9S4v21lZ9kO4qLSeGfjXua3eeiXDxhykLr zc3pOmX27G1E72MCVEgTVnyXLx1x9GfoI0KdlAZk4nMQN5kSoibbBCnyfmQr44yl6ISk veMYZVCqDVEkWbkkFxBhcfr1m7d/vgxxKFPYg6N/CCsKH4QwNeM0g7u9utQU9Mf1WXBv 3Mo2A9KlSWtSwGrZy4YMCimo91pV/jxACi6Bz+C/0P5qrteHYJxLjn1eRZXjnsbFjwfp QsPQ== X-Gm-Message-State: ALoCoQnfws1Pspyj/6FF8+PJZA4j/pFA5kSp1DyYqDieSS/neWK59ozb0mT2lFbtf8/zpFYThuG2 X-Received: by 10.236.200.194 with SMTP id z42mr4518yhn.28.1402005703940; Thu, 05 Jun 2014 15:01:43 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.19.83 with SMTP id 77ls425447qgg.28.gmail; Thu, 05 Jun 2014 15:01:43 -0700 (PDT) X-Received: by 10.220.98.143 with SMTP id q15mr728138vcn.38.1402005703848; Thu, 05 Jun 2014 15:01:43 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id t15si4642620vew.65.2014.06.05.15.01.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 05 Jun 2014 15:01:43 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id la4so1977664vcb.0 for ; Thu, 05 Jun 2014 15:01:43 -0700 (PDT) X-Received: by 10.52.25.130 with SMTP id c2mr470416vdg.27.1402005703752; Thu, 05 Jun 2014 15:01:43 -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 vs6csp50649vcb; Thu, 5 Jun 2014 15:01:43 -0700 (PDT) X-Received: by 10.68.103.165 with SMTP id fx5mr925094pbb.118.1402005702978; Thu, 05 Jun 2014 15:01:42 -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.42; Thu, 05 Jun 2014 15:01:42 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S1752881AbaFEWBS (ORCPT + 27 others); Thu, 5 Jun 2014 18:01:18 -0400 Received: from mail-gw2-out.broadcom.com ([216.31.210.63]:63755 "EHLO mail-gw2-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752432AbaFEWBN (ORCPT ); Thu, 5 Jun 2014 18:01:13 -0400 X-IronPort-AV: E=Sophos;i="4.98,983,1392192000"; d="scan'208";a="33057299" Received: from irvexchcas08.broadcom.com (HELO IRVEXCHCAS08.corp.ad.broadcom.com) ([10.9.208.57]) by mail-gw2-out.broadcom.com with ESMTP; 05 Jun 2014 15:04:00 -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:13 -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:13 -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 DB9239F9F7; Thu, 5 Jun 2014 15:01:10 -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 3/3] mmc: sdhci: Replace host->mmc with mmc where possible Date: Thu, 5 Jun 2014 15:00:05 -0700 Message-ID: <1402005605-24197-4-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-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@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.220.169 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: , After the switch to the MMC core regulator infrastucture, we already have a local "mmc" pointer in various functions. There is no longer a need to access the data structure via host->mmc. Signed-off-by: Markus Mayer Reviewed-by: Matt Porter --- drivers/mmc/host/sdhci.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index f15720e..86683bb 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1734,7 +1734,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, 3600000); if (ret) { pr_warning("%s: Switching to 3.3V signalling voltage " - " failed\n", mmc_hostname(host->mmc)); + " failed\n", mmc_hostname(mmc)); return -EIO; } } @@ -1747,7 +1747,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, return 0; pr_warning("%s: 3.3V regulator output did not became stable\n", - mmc_hostname(host->mmc)); + mmc_hostname(mmc)); return -EAGAIN; case MMC_SIGNAL_VOLTAGE_180: @@ -1756,7 +1756,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, 1700000, 1950000); if (ret) { pr_warning("%s: Switching to 1.8V signalling voltage " - " failed\n", mmc_hostname(host->mmc)); + " failed\n", mmc_hostname(mmc)); return -EIO; } } @@ -1777,7 +1777,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, return 0; pr_warning("%s: 1.8V regulator output did not became stable\n", - mmc_hostname(host->mmc)); + mmc_hostname(mmc)); return -EAGAIN; case MMC_SIGNAL_VOLTAGE_120: @@ -1786,7 +1786,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, 1300000); if (ret) { pr_warning("%s: Switching to 1.2V signalling voltage " - " failed\n", mmc_hostname(host->mmc)); + " failed\n", mmc_hostname(mmc)); return -EIO; } } @@ -3261,7 +3261,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) if (host->mrq) { pr_err("%s: Controller removed during " - " transfer!\n", mmc_hostname(host->mmc)); + " transfer!\n", mmc_hostname(mmc)); host->mrq->cmd->error = -ENOMEDIUM; tasklet_schedule(&host->finish_tasklet); @@ -3272,7 +3272,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) sdhci_disable_card_detection(host); - mmc_remove_host(host->mmc); + mmc_remove_host(mmc); #ifdef SDHCI_USE_LEDS_CLASS led_classdev_unregister(&host->led); @@ -3296,7 +3296,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) regulator_disable(mmc->supply.vqmmc); if (host->adma_desc) - dma_free_coherent(mmc_dev(host->mmc), ADMA_SIZE, + dma_free_coherent(mmc_dev(mmc), ADMA_SIZE, host->adma_desc, host->adma_addr); kfree(host->align_buffer);