diff options
| author | weety <[email protected]> | 2017-10-20 11:19:03 +0800 |
|---|---|---|
| committer | weety <[email protected]> | 2017-10-20 11:19:03 +0800 |
| commit | 5150e19d4b901db5b3f596b17e6aef857c4e424d (patch) | |
| tree | 24b531f32524ec6a6693e180a1fbcfe838119757 /components | |
| parent | dd5ac17fc8dc2c9dd166833b31ff08e7d9b316fb (diff) | |
[bsp][dm365] Support rt_hw_console_output function; Adjust the initialization sequence; Cleanup code.
[drv][mmcsd] Undo Changes.
Diffstat (limited to 'components')
| -rw-r--r-- | components/drivers/include/drivers/mmcsd_core.h | 4 | ||||
| -rw-r--r-- | components/drivers/sdio/block_dev.c | 5 | ||||
| -rw-r--r-- | components/drivers/sdio/mmcsd_core.c | 7 |
3 files changed, 4 insertions, 12 deletions
diff --git a/components/drivers/include/drivers/mmcsd_core.h b/components/drivers/include/drivers/mmcsd_core.h index 36d71efeb2..e474fa28a8 100644 --- a/components/drivers/include/drivers/mmcsd_core.h +++ b/components/drivers/include/drivers/mmcsd_core.h @@ -247,9 +247,9 @@ void mmcsd_change(struct rt_mmcsd_host *host); void mmcsd_detect(void *param); struct rt_mmcsd_host *mmcsd_alloc_host(void); void mmcsd_free_host(struct rt_mmcsd_host *host); -int rt_mmcsd_core_init(void); +void rt_mmcsd_core_init(void); -int rt_mmcsd_blk_init(void); +void rt_mmcsd_blk_init(void); rt_int32_t rt_mmcsd_blk_probe(struct rt_mmcsd_card *card); void rt_mmcsd_blk_remove(struct rt_mmcsd_card *card); diff --git a/components/drivers/sdio/block_dev.c b/components/drivers/sdio/block_dev.c index e6998f4fe3..c986556879 100644 --- a/components/drivers/sdio/block_dev.c +++ b/components/drivers/sdio/block_dev.c @@ -479,11 +479,8 @@ void rt_mmcsd_blk_remove(struct rt_mmcsd_card *card) * @deprecated since 2.1.0, this function does not need to be invoked * in the system initialization. */ -int rt_mmcsd_blk_init(void) +void rt_mmcsd_blk_init(void) { /* nothing */ - return 0; } -INIT_PREV_EXPORT(rt_mmcsd_blk_init); - diff --git a/components/drivers/sdio/mmcsd_core.c b/components/drivers/sdio/mmcsd_core.c index 3e98444b71..02063efdd2 100644 --- a/components/drivers/sdio/mmcsd_core.c +++ b/components/drivers/sdio/mmcsd_core.c @@ -655,7 +655,6 @@ void mmcsd_detect(void *param) if (init_sd(host, ocr)) mmcsd_power_off(host); mmcsd_host_unlock(host); - rt_mb_send(&mmcsd_hotpluge_mb, (rt_uint32_t)host); continue; } @@ -727,7 +726,7 @@ void mmcsd_free_host(struct rt_mmcsd_host *host) rt_free(host); } -int rt_mmcsd_core_init(void) +void rt_mmcsd_core_init(void) { rt_err_t ret; @@ -750,9 +749,5 @@ int rt_mmcsd_core_init(void) } rt_sdio_init(); - - return 0; } -INIT_PREV_EXPORT(rt_mmcsd_core_init); - |
