mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 20:51:44 +00:00
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>
This commit is contained in:
parent
a6a26a3e65
commit
fa7f289396
@ -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 = {
|
||||
|
Loading…
Reference in New Issue
Block a user