From patchwork Thu Feb 14 12:35:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 2141561 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id B238C3FCF6 for ; Thu, 14 Feb 2013 12:35:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759872Ab3BNMfq (ORCPT ); Thu, 14 Feb 2013 07:35:46 -0500 Received: from co9ehsobe002.messaging.microsoft.com ([207.46.163.25]:2259 "EHLO co9outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759672Ab3BNMfp (ORCPT ); Thu, 14 Feb 2013 07:35:45 -0500 Received: from mail199-co9-R.bigfish.com (10.236.132.254) by CO9EHSOBE020.bigfish.com (10.236.130.83) with Microsoft SMTP Server id 14.1.225.23; Thu, 14 Feb 2013 12:35:44 +0000 Received: from mail199-co9 (localhost [127.0.0.1]) by mail199-co9-R.bigfish.com (Postfix) with ESMTP id AD5CA5C0243; Thu, 14 Feb 2013 12:35:44 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h1ee6h1de0h1202h1e76h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1155h) Received: from mail199-co9 (localhost.localdomain [127.0.0.1]) by mail199-co9 (MessageSwitch) id 1360845309912617_26207; Thu, 14 Feb 2013 12:35:09 +0000 (UTC) Received: from CO9EHSMHS028.bigfish.com (unknown [10.236.132.245]) by mail199-co9.bigfish.com (Postfix) with ESMTP id DBBEF44026B; Thu, 14 Feb 2013 12:35:09 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS028.bigfish.com (10.236.130.38) with Microsoft SMTP Server (TLS) id 14.1.225.23; Thu, 14 Feb 2013 12:35:09 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.2.328.11; Thu, 14 Feb 2013 12:35:08 +0000 Received: from fabio-Latitude-E6410.am.freescale.net ([10.29.244.65]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id r1ECZ5PD018440; Thu, 14 Feb 2013 05:35:06 -0700 From: Fabio Estevam To: CC: , , , Fabio Estevam Subject: [PATCH v2] mmc: host: sdhci: Fix parameter of sdhci_do_start_signal_voltage_switch() Date: Thu, 14 Feb 2013 10:35:03 -0200 Message-ID: <1360845303-21620-1-git-send-email-fabio.estevam@freescale.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-OriginatorOrg: freescale.com Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Commit 3714f4315354 (mmc: sdhci: update signal voltage switch code) changed the type of the second parameter of sdhci_do_start_signal_voltage_switch(), from "struct mmc_ios *ios" to "int signal_voltage" which causes the following build warning: drivers/mmc/host/sdhci.c:2044:2: warning: initialization from incompatible pointer type [enabled by default] drivers/mmc/host/sdhci.c:2044:2: warning: (near initialization for 'sdhci_ops.start_signal_voltage_switch') [enabled by default] Use the previous type so that it matches the start_signal_voltage_switch() definition from host.h. Signed-off-by: Fabio Estevam Reviewed-by: Johan Rudholm --- Changes since v1: - Fix it inside sdhci to avoid breakage on other mmc controllers drivers/mmc/host/sdhci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 735526b..51bbba4 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1675,7 +1675,7 @@ static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable) } static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, - int signal_voltage) + struct mmc_ios *ios) { u16 ctrl; int ret; @@ -1689,7 +1689,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2); - switch (signal_voltage) { + switch (ios->signal_voltage) { case MMC_SIGNAL_VOLTAGE_330: /* Set 1.8V Signal Enable in the Host Control2 register to 0 */ ctrl &= ~SDHCI_CTRL_VDD_180; @@ -1762,7 +1762,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, } static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc, - int signal_voltage) + struct mmc_ios *ios) { struct sdhci_host *host = mmc_priv(mmc); int err; @@ -1770,7 +1770,7 @@ static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc, if (host->version < SDHCI_SPEC_300) return 0; sdhci_runtime_pm_get(host); - err = sdhci_do_start_signal_voltage_switch(host, signal_voltage); + err = sdhci_do_start_signal_voltage_switch(host, ios); sdhci_runtime_pm_put(host); return err; }