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>
diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
index bd6688ea..10e08a8 100644
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
@@ -84,7 +84,7 @@
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 @@
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;