1 files changed, 2 insertions, 31 deletions

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 0e637adc2b87..b502c7197ec0 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -111,36 +111,6 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
         return ret;
 }
 
-
-/**
- *      flush_read_buffer - push buffer to userspace.
- *      @buffer:        data buffer for file.
- *      @buf:           user-passed buffer.
- *      @count:         number of bytes requested.
- *      @ppos:          file position.
- *
- *      Copy the buffer we filled in fill_read_buffer() to userspace.
- *      This is done at the reader's leisure, copying and advancing 
- *      the amount they specify each time.
- *      This may be called continuously until the buffer is empty.
- */
-static int flush_read_buffer(struct sysfs_buffer * buffer, char __user * buf,
-                             size_t count, loff_t * ppos)
-{
-        int error;
-
-        if (*ppos > buffer->count)
-                return 0;
-
-        if (count > (buffer->count - *ppos))
-                count = buffer->count - *ppos;
-
-        error = copy_to_user(buf,buffer->page + *ppos,count);
-        if (!error)
-                *ppos += count;
-        return error ? -EFAULT : count;
-}
-
 /**
  *      sysfs_read_file - read an attribute. 
  *      @file:  file pointer.
@@ -177,7 +147,8 @@ sysfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *ppos)
         }
         pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n",
                  __FUNCTION__, count, *ppos, buffer->page);
-        retval = flush_read_buffer(buffer,buf,count,ppos);
+        retval = simple_read_from_buffer(buf, count, ppos, buffer->page,
+                                         buffer->count);
 out:
         up(&buffer->sem);
         return retval;