[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <200806092332.m59NW1e6014568@imap1.linux-foundation.org>
Date: Mon, 09 Jun 2008 16:32:01 -0700
From: akpm@...ux-foundation.org
To: davem@...emloft.net
Cc: netdev@...r.kernel.org, akpm@...ux-foundation.org,
akinobu.mita@...il.com, kkeil@...e.de
Subject: [patch 4/4] isdn: use simple_read_from_buffer()
From: Akinobu Mita <akinobu.mita@...il.com>
Signed-off-by: Akinobu Mita <akinobu.mita@...il.com>
Acked-by: Karsten Keil <kkeil@...e.de>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---
drivers/isdn/hysdn/hysdn_procconf.c | 27 ++++++--------------------
1 file changed, 7 insertions(+), 20 deletions(-)
diff -puN drivers/isdn/hysdn/hysdn_procconf.c~isdn-use-simple_read_from_buffer drivers/isdn/hysdn/hysdn_procconf.c
--- a/drivers/isdn/hysdn/hysdn_procconf.c~isdn-use-simple_read_from_buffer
+++ a/drivers/isdn/hysdn/hysdn_procconf.c
@@ -207,30 +207,17 @@ hysdn_conf_write(struct file *file, cons
/* read conf file -> output card info data */
/*******************************************/
static ssize_t
-hysdn_conf_read(struct file *file, char __user *buf, size_t count, loff_t * off)
+hysdn_conf_read(struct file *file, char __user *buf, size_t count, loff_t *off)
{
char *cp;
- int i;
- if (file->f_mode & FMODE_READ) {
- if (!(cp = file->private_data))
- return (-EFAULT); /* should never happen */
- i = strlen(cp); /* get total string length */
- if (*off < i) {
- /* still bytes to transfer */
- cp += *off; /* point to desired data offset */
- i -= *off; /* remaining length */
- if (i > count)
- i = count; /* limit length to transfer */
- if (copy_to_user(buf, cp, i))
- return (-EFAULT); /* copy error */
- *off += i; /* adjust offset */
- } else
- return (0);
- } else
- return (-EPERM); /* no permission to read */
+ if (!(file->f_mode & FMODE_READ))
+ return -EPERM; /* no permission to read */
- return (i);
+ if (!(cp = file->private_data))
+ return -EFAULT; /* should never happen */
+
+ return simple_read_from_buffer(buf, count, off, cp, strlen(cp));
} /* hysdn_conf_read */
/******************/
_
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists