[DeviceDrivers][MMC] rename fls to __rt_fls

BernardXiong · BernardXiong · commit ba2b1f0e56fb · 2018-03-04T17:25:59.000+08:00
diff --git 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
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ struct rt_mmcsd_req {`
`185`	`185`	`* Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.`
`186`	`186`	`*/`
`187`	`187`
`188`		`-rt_inline rt_uint32_t fls(rt_uint32_t val)`
	`188`	`+rt_inline rt_uint32_t __rt_fls(rt_uint32_t val)`
`189`	`189`	`{`
`190`	`190`	`rt_uint32_t bit = 32;`
`191`	`191`
Original file line number	Diff line number	Diff line change
`@@ -548,7 +548,7 @@ rt_uint32_t mmcsd_select_voltage(struct rt_mmcsd_host *host, rt_uint32_t ocr)`
`548`	`548`
`549`	`549`	`static void mmcsd_power_up(struct rt_mmcsd_host *host)`
`550`	`550`	`{`
`551`		`- int bit = fls(host->valid_ocr) - 1;`
	`551`	`+ int bit = __rt_fls(host->valid_ocr) - 1;`
`552`	`552`
`553`	`553`	`host->io_cfg.vdd = bit;`
`554`	`554`	`if (controller_is_spi(host))`