diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-31 17:26:36 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-31 17:26:36 -0600 |
| commit | 39c90ce1ce01a0b45451df19c1635240d47aaf29 (patch) | |
| tree | 3814c0a5ce1961e161e268801e0529a926100ffb /nuttx/fs/nxffs | |
| parent | e4f3869daedaf22dd224285cc7f0373e0a5025d2 (diff) | |
| download | nuttx-39c90ce1ce01a0b45451df19c1635240d47aaf29.tar.gz nuttx-39c90ce1ce01a0b45451df19c1635240d47aaf29.tar.bz2 nuttx-39c90ce1ce01a0b45451df19c1635240d47aaf29.zip | |
Rename kmalloc to kmm_malloc for consistency
Diffstat (limited to 'nuttx/fs/nxffs')
| -rw-r--r-- | nuttx/fs/nxffs/nxffs_dump.c | 2 | ||||
| -rw-r--r-- | nuttx/fs/nxffs/nxffs_initialize.c | 4 | ||||
| -rw-r--r-- | nuttx/fs/nxffs/nxffs_inode.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/fs/nxffs/nxffs_dump.c b/nuttx/fs/nxffs/nxffs_dump.c index 2cc50b1e0..f3208f5ff 100644 --- a/nuttx/fs/nxffs/nxffs_dump.c +++ b/nuttx/fs/nxffs/nxffs_dump.c @@ -439,7 +439,7 @@ int nxffs_dump(FAR struct mtd_dev_s *mtd, bool verbose) /* Allocate a buffer to hold one block */ - blkinfo.buffer = (FAR uint8_t *)kmalloc(blkinfo.geo.blocksize); + blkinfo.buffer = (FAR uint8_t *)kmm_malloc(blkinfo.geo.blocksize); if (!blkinfo.buffer) { fdbg("ERROR: Failed to allocate block cache\n"); diff --git a/nuttx/fs/nxffs/nxffs_initialize.c b/nuttx/fs/nxffs/nxffs_initialize.c index 34ac847ad..2aace3a7b 100644 --- a/nuttx/fs/nxffs/nxffs_initialize.c +++ b/nuttx/fs/nxffs/nxffs_initialize.c @@ -203,7 +203,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd) /* Allocate one I/O block buffer to general files system access */ - volume->cache = (FAR uint8_t *)kmalloc(volume->geo.blocksize); + volume->cache = (FAR uint8_t *)kmm_malloc(volume->geo.blocksize); if (!volume->cache) { fdbg("ERROR: Failed to allocate an erase block buffer\n"); @@ -216,7 +216,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd) * often, but is best to have pre-allocated and in-place. */ - volume->pack = (FAR uint8_t *)kmalloc(volume->geo.erasesize); + volume->pack = (FAR uint8_t *)kmm_malloc(volume->geo.erasesize); if (!volume->pack) { fdbg("ERROR: Failed to allocate an I/O block buffer\n"); diff --git a/nuttx/fs/nxffs/nxffs_inode.c b/nuttx/fs/nxffs/nxffs_inode.c index 4af7cfe41..fb1847893 100644 --- a/nuttx/fs/nxffs/nxffs_inode.c +++ b/nuttx/fs/nxffs/nxffs_inode.c @@ -134,7 +134,7 @@ static int nxffs_rdentry(FAR struct nxffs_volume_s *volume, off_t offset, /* Allocate memory to hold the variable-length file name */ namlen = inode.namlen; - entry->name = (FAR char *)kmalloc(namlen + 1); + entry->name = (FAR char *)kmm_malloc(namlen + 1); if (!entry->name) { fdbg("ERROR: Failed to allocate name, namlen: %d\n", namlen); |