From patchwork Thu Feb 14 02:14:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 2139911 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 40F393FCF6 for ; Thu, 14 Feb 2013 02:14:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752861Ab3BNCO4 (ORCPT ); Wed, 13 Feb 2013 21:14:56 -0500 Received: from mail-yh0-f41.google.com ([209.85.213.41]:48102 "EHLO mail-yh0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751530Ab3BNCO4 (ORCPT ); Wed, 13 Feb 2013 21:14:56 -0500 Received: by mail-yh0-f41.google.com with SMTP id 47so282771yhr.0 for ; Wed, 13 Feb 2013 18:14:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=B1Mb4XiGuXFe3b34q5i0WJ4tMb3Dns5pLdxYjWflnTM=; b=0lmBNA5JLeguZYINWtRcSo212SQ7jX7n+OwGO4N2pbwqZhF3eJuJfYS7R2ePE3IGQG /MiFjvUwjGEpWs5cErvqMzDr7exj8fNur+Yfcoz/XmdEXDfwyxf0KcmmdKyo+qhYRhms DAavKcyITnpKvo4XTBjM3bENUQ+fZbsF1sRTTj9CbJ62k1MTeh13QhC5R3iE2K8qMeUL AAIvTsJXeljAx+GOsDqOA7of5zPptgNej7ldhLMvLkasmanaLwUIOUI1ncmOF2/GlK3r Ne1v8IioDPFwX0qelCjrolApyfonRrb7o5Spa0KIja9szfPxyEO9BY4TR43vIqRkOEEG fBDQ== X-Received: by 10.236.92.134 with SMTP id j6mr16216607yhf.44.1360808094177; Wed, 13 Feb 2013 18:14:54 -0800 (PST) Received: from localhost.localdomain ([201.82.137.218]) by mx.google.com with ESMTPS id h3sm22876810ani.4.2013.02.13.18.14.51 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 13 Feb 2013 18:14:53 -0800 (PST) From: Fabio Estevam To: cjb@laptop.org Cc: kliu5@marvell.com, linux-mmc@vger.kernel.org, Fabio Estevam Subject: [PATCH] mmc: core: Fix start_signal_voltage_switch argument type Date: Thu, 14 Feb 2013 00:14:44 -0200 Message-Id: <1360808084-9128-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Fabio Estevam Since commit 3714f4315354 (mmc: sdhci: update signal voltage switch code) the second argument of start_signal_voltage_switch has 'int signal_voltage' type, so update mmc core and the mmc host struct definition accordingly. Fix 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] Signed-off-by: Fabio Estevam --- drivers/mmc/core/core.c | 2 +- include/linux/mmc/host.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 08a3cf2..c346bc7 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1325,7 +1325,7 @@ int __mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage) host->ios.signal_voltage = signal_voltage; if (host->ops->start_signal_voltage_switch) { mmc_host_clk_hold(host); - err = host->ops->start_signal_voltage_switch(host, &host->ios); + err = host->ops->start_signal_voltage_switch(host, signal_voltage); mmc_host_clk_release(host); } diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index fd5fd5a..ad8b1a6 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -129,7 +129,8 @@ struct mmc_host_ops { /* optional callback for HC quirks */ void (*init_card)(struct mmc_host *host, struct mmc_card *card); - int (*start_signal_voltage_switch)(struct mmc_host *host, struct mmc_ios *ios); + int (*start_signal_voltage_switch)(struct mmc_host *host, + int signal_voltage); /* Check if the card is pulling dat[0:3] low */ int (*card_busy)(struct mmc_host *host);