Covert FFS_INVALIDFID to -EINVAL

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

diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
index 292af85e3cd2..7a817405c624 100644
--- a/drivers/staging/exfat/exfat.h
+++ b/drivers/staging/exfat/exfat.h
@@ -214,7 +214,6 @@ static inline u16 get_row_index(u16 i)
 #define FFS_NOTMOUNTED          4
 #define FFS_ALIGNMENTERR        5
 #define FFS_SEMAPHOREERR        6
-#define FFS_INVALIDFID          8
 #define FFS_NOTOPENED           12
 #define FFS_MAXOPENED           13
 #define FFS_ERROR               19
diff --git a/drivers/staging/exfat/exfat_super.c 
b/drivers/staging/exfat/exfat_super.c
index 7c99d1f8cba8..dd6530aef63a 100644
--- a/drivers/staging/exfat/exfat_super.c
+++ b/drivers/staging/exfat/exfat_super.c
@@ -699,7 +699,7 @@ static int ffsReadFile(struct inode *inode, struct 
file_id_t *fid, void *buffer,
 
        /* check the validity of the given file id */
        if (!fid)
-               return FFS_INVALIDFID;
+               return -EINVAL;
 
        /* check the validity of pointer parameters */
        if (!buffer)
@@ -831,7 +831,7 @@ static int ffsWriteFile(struct inode *inode, struct 
file_id_t *fid,
 
        /* check the validity of the given file id */
        if (!fid)
-               return FFS_INVALIDFID;
+               return -EINVAL;
 
        /* check the validity of pointer parameters */
        if (!buffer)
@@ -1237,7 +1237,7 @@ static int ffsMoveFile(struct inode *old_parent_inode, 
struct file_id_t *fid,
 
        /* check the validity of the given file id */
        if (!fid)
-               return FFS_INVALIDFID;
+               return -EINVAL;
 
        /* check the validity of pointer parameters */
        if (!new_path || (*new_path == '\0'))
@@ -1358,7 +1358,7 @@ static int ffsRemoveFile(struct inode *inode, struct 
file_id_t *fid)
 
        /* check the validity of the given file id */
        if (!fid)
-               return FFS_INVALIDFID;
+               return -EINVAL;
 
        /* acquire the lock for file system critical section */
        mutex_lock(&p_fs->v_mutex);
@@ -2145,7 +2145,7 @@ static int ffsRemoveDir(struct inode *inode, struct 
file_id_t *fid)
 
        /* check the validity of the given file id */
        if (!fid)
-               return FFS_INVALIDFID;
+               return -EINVAL;
 
        dir.dir = fid->dir.dir;
        dir.size = fid->dir.size;
-- 
2.24.0

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

Reply via email to