uml: rename os_{read_write}_file_k back to os_{read_write}_file

Rename os_{read_write}_file_k back to os_{read_write}_file, delete
the originals and their bogus infrastructure, and fix all the callers.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
index bd6688ea96d..10e08a8c17c 100644
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
@@ -84,7 +84,7 @@ static ssize_t hostaudio_read(struct file *file, char __user *buffer,
         if(kbuf == NULL)
                 return(-ENOMEM);
 
-        err = os_read_file_k(state->fd, kbuf, count);
+        err = os_read_file(state->fd, kbuf, count);
         if(err < 0)
                 goto out;
 
@@ -115,7 +115,7 @@ static ssize_t hostaudio_write(struct file *file, const char __user *buffer,
         if(copy_from_user(kbuf, buffer, count))
                 goto out;
 
-        err = os_write_file_k(state->fd, kbuf, count);
+        err = os_write_file(state->fd, kbuf, count);
         if(err < 0)
                 goto out;
         *ppos += err;