staging: exfat: Clean up return code - FFS_MEMORYERR

Convert FFS_MEMORYERR to -ENOMEM

Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Link: https://lore.kernel.org/r/20191024155327.1095907-9-Valdis.Kletnieks@vt.edu
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
index 8cb6d2e2ad8d04b904be19a46758641d38e2461a..6142e880f68219628a3c422cc12bc0a4e4a154ea 100644 (file)
--- 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 0331fa6724ff2283361016ad2fcb6c7c6babedd6..80fd3f0d6db41a9006723e88e1aecaf59979d038 100644 (file)
--- a/drivers/staging/exfat/exfat_core.c
+++ b/drivers/staging/exfat/exfat_core.c
@@ -544,7 +544,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);
 
@@ -715,7 +715,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) {
@@ -755,7 +755,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;
                                        }
 
@@ -795,7 +795,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) {
@@ -818,7 +818,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;
                                }