From 5d2db594240ffeda5c58522694bcd1603aab2e76 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Sun, 3 Nov 2019 07:33:04 -0600
Subject: [PATCH] drivers/rptun/rptun.c:  Switch open/close/seek/read to file_*
 version.

---
 drivers/rptun/rptun.c | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/drivers/rptun/rptun.c b/drivers/rptun/rptun.c
index c350547bd0..6fa56a0b46 100644
--- a/drivers/rptun/rptun.c
+++ b/drivers/rptun/rptun.c
@@ -97,8 +97,8 @@ struct rptun_cb_s
 
 struct rptun_store_s
 {
-  int  fd;
-  FAR char *buf;
+  struct file file;
+  FAR char   *buf;
 };
 
 /****************************************************************************
@@ -579,23 +579,24 @@ static int rptun_store_open(FAR void *store_, FAR const char *path,
 {
   FAR struct rptun_store_s *store = store_;
   int len = 0x100;
+  int ret;
 
-  store->fd = open(path, O_RDONLY);
-  if (store->fd < 0)
+  ret = file_open(&store->file, path, O_RDONLY);
+  if (ret < 0)
     {
-      return -EINVAL;
+      return ret;
     }
 
   store->buf = kmm_malloc(len);
   if (!store->buf)
     {
-      close(store->fd);
+      file_close(&store->file);
       return -ENOMEM;
     }
 
   *img_data = store->buf;
 
-  return read(store->fd, store->buf, len);
+  return file_read(&store->file, store->buf, len);
 }
 
 static void rptun_store_close(FAR void *store_)
@@ -603,7 +604,7 @@ static void rptun_store_close(FAR void *store_)
   FAR struct rptun_store_s *store = store_;
 
   kmm_free(store->buf);
-  close(store->fd);
+  file_close(&store->file);
 }
 
 static int rptun_store_load(FAR void *store_, size_t offset,
@@ -635,8 +636,8 @@ static int rptun_store_load(FAR void *store_, size_t offset,
         }
     }
 
-  lseek(store->fd, offset, SEEK_SET);
-  return read(store->fd, tmp, size);
+  file_seek(&store->file, offset, SEEK_SET);
+  return file_read(&store->file, tmp, size);
 }
 
 static metal_phys_addr_t rptun_pa_to_da(FAR struct rptun_dev_s *dev,
@@ -842,7 +843,7 @@ int rptun_initialize(FAR struct rptun_dev_s *dev)
 
 int rptun_boot(FAR const char *cpuname)
 {
-  struct file filep;
+  struct file file;
   char name[16];
   int ret;
 
@@ -853,14 +854,14 @@ int rptun_boot(FAR const char *cpuname)
 
   sprintf(name, "/dev/rptun%s", cpuname);
 
-  ret = file_open(&filep, name, 0, 0);
+  ret = file_open(&file, name, 0, 0);
   if (ret)
     {
       return ret;
     }
 
-  ret = file_ioctl(&filep, RPTUNIOC_START, 0);
-  file_close(&filep);
+  ret = file_ioctl(&file, RPTUNIOC_START, 0);
+  file_close(&file);
 
   return ret;
 }