From a6ea4cceed18edebe1eb6001cb9e0f88cd741a6c Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Sun, 6 May 2007 14:51:43 -0700 Subject: 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 Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/um/drivers/hostaudio_kern.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/um/drivers/hostaudio_kern.c') diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c index bd6688ea96de..10e08a8c17c3 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; -- cgit