diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-02-14 07:35:03 -0500 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2013-02-24 14:37:18 -0500 |
commit | 21f5998f10a4d10dce48e9831ab2deb7e8f1a1fa (patch) | |
tree | 187fe9a19a8c6ad33bcbefb6f91297e36c13278f /drivers/mmc | |
parent | a4f8f257eddcdf13417476c8479c616560a4417a (diff) |
mmc: sdhci: Fix parameter of sdhci_do_start_signal_voltage_switch()
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 <fabio.estevam@freescale.com>
Reviewed-by: Johan Rudholm <johan.rudholm@stericsson.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/sdhci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 735526bf8d58..51bbba486f38 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) | |||
1675 | } | 1675 | } |
1676 | 1676 | ||
1677 | static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, | 1677 | static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, |
1678 | int signal_voltage) | 1678 | struct mmc_ios *ios) |
1679 | { | 1679 | { |
1680 | u16 ctrl; | 1680 | u16 ctrl; |
1681 | int ret; | 1681 | int ret; |
@@ -1689,7 +1689,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, | |||
1689 | 1689 | ||
1690 | ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2); | 1690 | ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2); |
1691 | 1691 | ||
1692 | switch (signal_voltage) { | 1692 | switch (ios->signal_voltage) { |
1693 | case MMC_SIGNAL_VOLTAGE_330: | 1693 | case MMC_SIGNAL_VOLTAGE_330: |
1694 | /* Set 1.8V Signal Enable in the Host Control2 register to 0 */ | 1694 | /* Set 1.8V Signal Enable in the Host Control2 register to 0 */ |
1695 | ctrl &= ~SDHCI_CTRL_VDD_180; | 1695 | ctrl &= ~SDHCI_CTRL_VDD_180; |
@@ -1762,7 +1762,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, | |||
1762 | } | 1762 | } |
1763 | 1763 | ||
1764 | static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc, | 1764 | static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc, |
1765 | int signal_voltage) | 1765 | struct mmc_ios *ios) |
1766 | { | 1766 | { |
1767 | struct sdhci_host *host = mmc_priv(mmc); | 1767 | struct sdhci_host *host = mmc_priv(mmc); |
1768 | int err; | 1768 | int err; |
@@ -1770,7 +1770,7 @@ static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc, | |||
1770 | if (host->version < SDHCI_SPEC_300) | 1770 | if (host->version < SDHCI_SPEC_300) |
1771 | return 0; | 1771 | return 0; |
1772 | sdhci_runtime_pm_get(host); | 1772 | sdhci_runtime_pm_get(host); |
1773 | err = sdhci_do_start_signal_voltage_switch(host, signal_voltage); | 1773 | err = sdhci_do_start_signal_voltage_switch(host, ios); |
1774 | sdhci_runtime_pm_put(host); | 1774 | sdhci_runtime_pm_put(host); |
1775 | return err; | 1775 | return err; |
1776 | } | 1776 | } |