summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2018-03-04 17:25:59 +0800
committerBernard Xiong <[email protected]>2018-03-04 17:25:59 +0800
commitba2b1f0e56fb4b5bdcd1a09683f88c002f11fbf5 (patch)
tree98409607fa13b97ef260a1899fab05691f93e702
parent7f1db36f39fda0d56ecb4e20ac096c42dee06d74 (diff)
[DeviceDrivers][MMC] rename fls to __rt_fls
-rw-r--r--components/drivers/include/drivers/mmcsd_core.h2
-rw-r--r--components/drivers/sdio/mmcsd_core.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/components/drivers/include/drivers/mmcsd_core.h b/components/drivers/include/drivers/mmcsd_core.h
index 36d71efeb2..424f9a0c85 100644
--- a/components/drivers/include/drivers/mmcsd_core.h
+++ b/components/drivers/include/drivers/mmcsd_core.h
@@ -185,7 +185,7 @@ struct rt_mmcsd_req {
* Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
*/
-rt_inline rt_uint32_t fls(rt_uint32_t val)
+rt_inline rt_uint32_t __rt_fls(rt_uint32_t val)
{
rt_uint32_t bit = 32;
diff --git a/components/drivers/sdio/mmcsd_core.c b/components/drivers/sdio/mmcsd_core.c
index d240dca400..edf4002ac7 100644
--- a/components/drivers/sdio/mmcsd_core.c
+++ b/components/drivers/sdio/mmcsd_core.c
@@ -548,7 +548,7 @@ rt_uint32_t mmcsd_select_voltage(struct rt_mmcsd_host *host, rt_uint32_t ocr)
static void mmcsd_power_up(struct rt_mmcsd_host *host)
{
- int bit = fls(host->valid_ocr) - 1;
+ int bit = __rt_fls(host->valid_ocr) - 1;
host->io_cfg.vdd = bit;
if (controller_is_spi(host))