From ba2b1f0e56fb4b5bdcd1a09683f88c002f11fbf5 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Sun, 4 Mar 2018 17:25:59 +0800 Subject: [PATCH] [DeviceDrivers][MMC] rename fls to __rt_fls --- components/drivers/include/drivers/mmcsd_core.h | 2 +- components/drivers/sdio/mmcsd_core.c | 2 +- 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))