mmc: core: Rename __mmc_set_signal_voltage() to mmc_set_signal_voltage()

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Earlier the mmc_set_signal_voltage() existed, but since it has been renamed
to mmc_set_uhs_voltage(), we can now use that name instead.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Tested-by: Jan Glauber <jglauber@cavium.com>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>

Ulf Hansson 9 years ago 4e74b6b3 2ed573b6

+14 -14

3 changed files

expand all

drivers

mmc

core

core.c

core.h

mmc.c

+5 -5

drivers/mmc/core/core.c

··· 1631 1631 return ocr; 1632 1632 } 1633 1633 1634 - int __mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage) 1634 + int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage) 1635 1635 { 1636 1636 int err = 0; 1637 1637 int old_signal_voltage = host->ios.signal_voltage; ··· 1691 1691 host->ios.clock = 0; 1692 1692 mmc_set_ios(host); 1693 1693 1694 - if (__mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180)) { 1694 + if (mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180)) { 1695 1695 /* 1696 1696 * Voltages may not have been switched, but we've already 1697 1697 * sent CMD11, so a power cycle is required anyway ··· 1800 1800 mmc_set_initial_state(host); 1801 1801 1802 1802 /* Try to set signal voltage to 3.3V but fall back to 1.8v or 1.2v */ 1803 - if (__mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330) == 0) 1803 + if (!mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330)) 1804 1804 dev_dbg(mmc_dev(host), "Initial signal voltage of 3.3v\n"); 1805 - else if (__mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180) == 0) 1805 + else if (!mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180)) 1806 1806 dev_dbg(mmc_dev(host), "Initial signal voltage of 1.8v\n"); 1807 - else if (__mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120) == 0) 1807 + else if (!mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120)) 1808 1808 dev_dbg(mmc_dev(host), "Initial signal voltage of 1.2v\n"); 1809 1809 1810 1810 /*

+1 -1

drivers/mmc/core/core.h

··· 49 49 void mmc_set_bus_width(struct mmc_host *host, unsigned int width); 50 50 u32 mmc_select_voltage(struct mmc_host *host, u32 ocr); 51 51 int mmc_set_uhs_voltage(struct mmc_host *host, u32 ocr); 52 - int __mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage); 52 + int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage); 53 53 void mmc_set_timing(struct mmc_host *host, unsigned int timing); 54 54 void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type); 55 55 int mmc_select_drive_strength(struct mmc_card *card, unsigned int max_dtr,

+8 -8

drivers/mmc/core/mmc.c

··· 1122 1122 */ 1123 1123 err = -EINVAL; 1124 1124 if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_DDR_1_2V) 1125 - err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120); 1125 + err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120); 1126 1126 1127 1127 if (err && (card->mmc_avail_type & EXT_CSD_CARD_TYPE_DDR_1_8V)) 1128 - err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180); 1128 + err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180); 1129 1129 1130 1130 /* make sure vccq is 3.3v after switching disaster */ 1131 1131 if (err) 1132 - err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330); 1132 + err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330); 1133 1133 1134 1134 return err; 1135 1135 } ··· 1296 1296 } 1297 1297 1298 1298 if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400_1_2V) 1299 - err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120); 1299 + err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120); 1300 1300 1301 1301 if (err && card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400_1_8V) 1302 - err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180); 1302 + err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180); 1303 1303 1304 1304 /* If fails try again during next card power cycle */ 1305 1305 if (err) ··· 1405 1405 1406 1406 old_signal_voltage = host->ios.signal_voltage; 1407 1407 if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS200_1_2V) 1408 - err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120); 1408 + err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120); 1409 1409 1410 1410 if (err && card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS200_1_8V) 1411 - err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180); 1411 + err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180); 1412 1412 1413 1413 /* If fails try again during next card power cycle */ 1414 1414 if (err) ··· 1450 1450 err: 1451 1451 if (err) { 1452 1452 /* fall back to the old signal voltage, if fails report error */ 1453 - if (__mmc_set_signal_voltage(host, old_signal_voltage)) 1453 + if (mmc_set_signal_voltage(host, old_signal_voltage)) 1454 1454 err = -EIO; 1455 1455 1456 1456 pr_err("%s: %s failed, error %d\n", mmc_hostname(card->host),