summaryrefslogtreecommitdiffstats
path: root/drivers/zorro
diff options
context:
space:
mode:
authorakinobu.mita@gmail.com <akinobu.mita@gmail.com>2008-07-17 21:16:17 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-20 17:24:38 -0700
commitfa7f28939634c2ea36817a0c3dbd8d84972c1488 (patch)
tree35ec91e26e03d1125b8dce2e2b7f0e549a7bd6dc /drivers/zorro
parenta6a26a3e652671a783563f1e9697c68bd19c40fc (diff)
downloadlinux-stable-fa7f28939634c2ea36817a0c3dbd8d84972c1488.tar.gz
linux-stable-fa7f28939634c2ea36817a0c3dbd8d84972c1488.tar.bz2
linux-stable-fa7f28939634c2ea36817a0c3dbd8d84972c1488.zip
zorro: use memory_read_from_buffer
zorro: use memory_read_from_buffer Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/zorro')
-rw-r--r--drivers/zorro/zorro-sysfs.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c
index 808b4f8675c5..3da712cc7708 100644
--- a/drivers/zorro/zorro-sysfs.c
+++ b/drivers/zorro/zorro-sysfs.c
@@ -15,6 +15,7 @@
#include <linux/zorro.h>
#include <linux/stat.h>
#include <linux/string.h>
+#include <linux/fs.h>
#include "zorro.h"
@@ -56,12 +57,6 @@ static ssize_t zorro_read_config(struct kobject *kobj,
struct zorro_dev *z = to_zorro_dev(container_of(kobj, struct device,
kobj));
struct ConfigDev cd;
- unsigned int size = sizeof(cd);
-
- if (off > size)
- return 0;
- if (off+count > size)
- count = size-off;
/* Construct a ConfigDev */
memset(&cd, 0, sizeof(cd));
@@ -71,8 +66,7 @@ static ssize_t zorro_read_config(struct kobject *kobj,
cd.cd_BoardAddr = (void *)zorro_resource_start(z);
cd.cd_BoardSize = zorro_resource_len(z);
- memcpy(buf, (void *)&cd+off, count);
- return count;
+ return memory_read_from_buffer(buf, count, &off, &cd, sizeof(cd));
}
static struct bin_attribute zorro_config_attr = {