UEFI applications call file system functions to determine if a file exists. The return codes are evaluated to show appropriate messages. U-Boot's file system layer should not interfere with the output.

Rename file_fat_read_at() to fat_read_file() adjusting the parameter sequence and names and eliminate the old wrapper function.

Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com --- fs/fat/fat.c | 22 +++++----------------- include/fat.h | 2 -- 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/fs/fat/fat.c b/fs/fat/fat.c index a945904785..2da93dae3c 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -1243,8 +1243,8 @@ out_free_itr: return ret; }

-int file_fat_read_at(const char *filename, loff_t pos, void *buffer, - loff_t maxsize, loff_t *actread) +int fat_read_file(const char *filename, void *buf, loff_t offset, loff_t len, + loff_t *actread) { fsdata fsdata; fat_itr *itr; @@ -1261,12 +1261,12 @@ int file_fat_read_at(const char *filename, loff_t pos, void *buffer, if (ret) goto out_free_both;

- debug("reading %s at pos %llu\n", filename, pos); + debug("reading %s at pos %llu\n", filename, offset);

/* For saving default max clustersize memory allocated to malloc pool */ dir_entry *dentptr = itr->dent;

- ret = get_contents(&fsdata, dentptr, pos, buffer, maxsize, actread); + ret = get_contents(&fsdata, dentptr, offset, buf, len, actread);

out_free_both: free(fsdata.fatbuf); @@ -1280,25 +1280,13 @@ int file_fat_read(const char *filename, void *buffer, int maxsize) loff_t actread; int ret;

- ret = file_fat_read_at(filename, 0, buffer, maxsize, &actread); + ret = fat_read_file(filename, buffer, 0, maxsize, &actread); if (ret) return ret; else return actread; }

-int fat_read_file(const char *filename, void *buf, loff_t offset, loff_t len, - loff_t *actread) -{ - int ret; - - ret = file_fat_read_at(filename, offset, buf, len, actread); - if (ret) - printf("** Unable to read file %s **\n", filename); - - return ret; -} - typedef struct { struct fs_dir_stream parent; struct fs_dirent dirent; diff --git a/include/fat.h b/include/fat.h index bd8e450b33..a9756fb4cd 100644 --- a/include/fat.h +++ b/include/fat.h @@ -200,8 +200,6 @@ static inline u32 sect_to_clust(fsdata *fsdata, int sect) int file_fat_detectfs(void); int fat_exists(const char *filename); int fat_size(const char *filename, loff_t *size); -int file_fat_read_at(const char *filename, loff_t pos, void *buffer, - loff_t maxsize, loff_t *actread); int file_fat_read(const char *filename, void *buffer, int maxsize); int fat_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info); int fat_register_device(struct blk_desc *dev_desc, int part_no);