From 591a9c85d2beef075f991541b6b18a930704ef68 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 31 Aug 2014 17:26:36 -0600 Subject: [PATCH] Rename kmalloc to kmm_malloc for consistency --- configs/ea3131/src/up_usbmsc.c | 2 +- configs/ea3152/src/up_usbmsc.c | 2 +- configs/mikroe-stm32f4/src/up_nsh.c | 2 +- configs/mikroe-stm32f4/src/up_touchscreen.c | 4 ++-- configs/pic32mx7mmb/src/up_touchscreen.c | 4 ++-- configs/stm32f429i-disco/src/stm32_nsh.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/ea3131/src/up_usbmsc.c b/configs/ea3131/src/up_usbmsc.c index 9a7e744276..aee0224901 100644 --- a/configs/ea3131/src/up_usbmsc.c +++ b/configs/ea3131/src/up_usbmsc.c @@ -89,7 +89,7 @@ int usbmsc_archinitialize(void) uint8_t *pbuffer; int ret; - pbuffer = (uint8_t *)kmalloc(BUFFER_SIZE); + pbuffer = (uint8_t *)kmm_malloc(BUFFER_SIZE); if (!pbuffer) { lowsyslog("usbmsc_archinitialize: Failed to allocate ramdisk of size %d\n", diff --git a/configs/ea3152/src/up_usbmsc.c b/configs/ea3152/src/up_usbmsc.c index 44d11089d3..55bd3440c7 100644 --- a/configs/ea3152/src/up_usbmsc.c +++ b/configs/ea3152/src/up_usbmsc.c @@ -89,7 +89,7 @@ int usbmsc_archinitialize(void) uint8_t *pbuffer; int ret; - pbuffer = (uint8_t *)kmalloc(BUFFER_SIZE); + pbuffer = (uint8_t *)kmm_malloc(BUFFER_SIZE); if (!pbuffer) { lowsyslog("usbmsc_archinitialize: Failed to allocate ramdisk of size %d\n", diff --git a/configs/mikroe-stm32f4/src/up_nsh.c b/configs/mikroe-stm32f4/src/up_nsh.c index 844389e93d..80331fe40d 100644 --- a/configs/mikroe-stm32f4/src/up_nsh.c +++ b/configs/mikroe-stm32f4/src/up_nsh.c @@ -291,7 +291,7 @@ int nsh_archinitialize(void) #if defined(CONFIG_RAMMTD) && defined(CONFIG_MIKROE_RAMMTD) { - uint8_t *start = (uint8_t *) kmalloc(CONFIG_MIKROE_RAMMTD_SIZE * 1024); + uint8_t *start = (uint8_t *) kmm_malloc(CONFIG_MIKROE_RAMMTD_SIZE * 1024); mtd = rammtd_initialize(start, CONFIG_MIKROE_RAMMTD_SIZE * 1024); mtd->ioctl(mtd, MTDIOC_BULKERASE, 0); diff --git a/configs/mikroe-stm32f4/src/up_touchscreen.c b/configs/mikroe-stm32f4/src/up_touchscreen.c index ab18f05d5a..3466e60b06 100644 --- a/configs/mikroe-stm32f4/src/up_touchscreen.c +++ b/configs/mikroe-stm32f4/src/up_touchscreen.c @@ -1529,10 +1529,10 @@ int arch_tcinitialize(int minor) #ifndef CONFIG_TOUCHSCREEN_MULTIPLE priv = &g_touchscreen; #else - priv = (FAR struct tc_dev_s *)kmalloc(sizeof(struct tc_dev_s)); + priv = (FAR struct tc_dev_s *)kmm_malloc(sizeof(struct tc_dev_s)); if (!priv) { - idbg("kmalloc(%d) failed\n", sizeof(struct tc_dev_s)); + idbg("kmm_malloc(%d) failed\n", sizeof(struct tc_dev_s)); return -ENOMEM; } #endif diff --git a/configs/pic32mx7mmb/src/up_touchscreen.c b/configs/pic32mx7mmb/src/up_touchscreen.c index fd048d6139..532e612cb8 100644 --- a/configs/pic32mx7mmb/src/up_touchscreen.c +++ b/configs/pic32mx7mmb/src/up_touchscreen.c @@ -1386,10 +1386,10 @@ int arch_tcinitialize(int minor) #ifndef CONFIG_TOUCHSCREEN_MULTIPLE priv = &g_touchscreen; #else - priv = (FAR struct tc_dev_s *)kmalloc(sizeof(struct tc_dev_s)); + priv = (FAR struct tc_dev_s *)kmm_malloc(sizeof(struct tc_dev_s)); if (!priv) { - idbg("kmalloc(%d) failed\n", sizeof(struct tc_dev_s)); + idbg("kmm_malloc(%d) failed\n", sizeof(struct tc_dev_s)); return -ENOMEM; } #endif diff --git a/configs/stm32f429i-disco/src/stm32_nsh.c b/configs/stm32f429i-disco/src/stm32_nsh.c index 3504ed05d5..58e49d5f48 100644 --- a/configs/stm32f429i-disco/src/stm32_nsh.c +++ b/configs/stm32f429i-disco/src/stm32_nsh.c @@ -293,7 +293,7 @@ int nsh_archinitialize(void) #if defined(CONFIG_RAMMTD) && defined(CONFIG_STM32F429I_DISCO_RAMMTD) { - uint8_t *start = (uint8_t *) kmalloc(CONFIG_STM32F429I_DISCO_RAMMTD_SIZE * 1024); + uint8_t *start = (uint8_t *) kmm_malloc(CONFIG_STM32F429I_DISCO_RAMMTD_SIZE * 1024); mtd = rammtd_initialize(start, CONFIG_STM32F429I_DISCO_RAMMTD_SIZE * 1024); mtd->ioctl(mtd, MTDIOC_BULKERASE, 0);