[PATCH 08/15] staging: exfat: Clean up return code - FFS_MEMORYERR

[Valdis Kletnieks]

Convert FFS_MEMORYERR to -ENOMEM

Signed-off-by: Valdis Kletnieks <valdis.kletni...@vt.edu>
---
 drivers/staging/exfat/exfat.h      |  1 -
 drivers/staging/exfat/exfat_core.c | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
index 00e5e37100ce..2588a6cbe552 100644
--- a/drivers/staging/exfat/exfat.h
+++ b/drivers/staging/exfat/exfat.h
@@ -218,7 +218,6 @@ static inline u16 get_row_index(u16 i)
 #define FFS_NOTOPENED           12
 #define FFS_MAXOPENED           13
 #define FFS_EOF                 15
-#define FFS_MEMORYERR           17
 #define FFS_ERROR               19
 
 #define NUM_UPCASE              2918
diff --git a/drivers/staging/exfat/exfat_core.c 
b/drivers/staging/exfat/exfat_core.c
index 23c369fb98e5..fa2bf18b4a14 100644
--- a/drivers/staging/exfat/exfat_core.c
+++ b/drivers/staging/exfat/exfat_core.c
@@ -177,7 +177,7 @@ s32 load_alloc_bitmap(struct super_block *sb)
                                                               sizeof(struct 
buffer_head *),
                                                               GFP_KERNEL);
                                if (!p_fs->vol_amap)
-                                       return FFS_MEMORYERR;
+                                       return -ENOMEM;
 
                                sector = START_SECTOR(p_fs->map_clu);
 
@@ -604,7 +604,7 @@ static s32 __load_upcase_table(struct super_block *sb, 
sector_t sector,
        upcase_table = p_fs->vol_utbl = kmalloc(UTBL_COL_COUNT * sizeof(u16 *),
                                                GFP_KERNEL);
        if (!upcase_table)
-               return FFS_MEMORYERR;
+               return -ENOMEM;
        memset(upcase_table, 0, UTBL_COL_COUNT * sizeof(u16 *));
 
        while (sector < end_sector) {
@@ -644,7 +644,7 @@ static s32 __load_upcase_table(struct super_block *sb, 
sector_t sector,
                                        upcase_table[col_index] = 
kmalloc_array(UTBL_ROW_COUNT,
                                                sizeof(u16), GFP_KERNEL);
                                        if (!upcase_table[col_index]) {
-                                               ret = FFS_MEMORYERR;
+                                               ret = -ENOMEM;
                                                goto error;
                                        }
 
@@ -684,7 +684,7 @@ static s32 __load_default_upcase_table(struct super_block 
*sb)
        upcase_table = p_fs->vol_utbl = kmalloc(UTBL_COL_COUNT * sizeof(u16 *),
                                                GFP_KERNEL);
        if (!upcase_table)
-               return FFS_MEMORYERR;
+               return -ENOMEM;
        memset(upcase_table, 0, UTBL_COL_COUNT * sizeof(u16 *));
 
        for (i = 0; index <= 0xFFFF && i < NUM_UPCASE * 2; i += 2) {
@@ -707,7 +707,7 @@ static s32 __load_default_upcase_table(struct super_block 
*sb)
                                                                        
sizeof(u16),
                                                                        
GFP_KERNEL);
                                if (!upcase_table[col_index]) {
-                                       ret = FFS_MEMORYERR;
+                                       ret = -ENOMEM;
                                        goto error;
                                }
 
-- 
2.23.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel