From: Akinobu Mita Date: Mon, 9 Jun 2008 23:44:30 +0000 (-0700) Subject: airo: use simple_read_from_buffer() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cc0d9ff2c998410c7d4a99061a3ebdaa5c55ae9d;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git airo: use simple_read_from_buffer() Signed-off-by: Akinobu Mita Cc: Dan Williams Cc: Michal Schmidt Signed-off-by: Andrew Morton Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 1e1446bf4b48..e30f8b79ea89 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -4561,22 +4561,13 @@ static ssize_t proc_read( struct file *file, size_t len, loff_t *offset ) { - loff_t pos = *offset; - struct proc_data *priv = (struct proc_data*)file->private_data; + struct proc_data *priv = file->private_data; if (!priv->rbuffer) return -EINVAL; - if (pos < 0) - return -EINVAL; - if (pos >= priv->readlen) - return 0; - if (len > priv->readlen - pos) - len = priv->readlen - pos; - if (copy_to_user(buffer, priv->rbuffer + pos, len)) - return -EFAULT; - *offset = pos + len; - return len; + return simple_read_from_buffer(buffer, len, offset, priv->rbuffer, + priv->readlen); } /*