From 212f631eb441b9ae2d154b6503b9083a1fda3e5b Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 11 Oct 2007 22:00:22 +0200 Subject: let erase and protect functions return int instead of size_t. They only return succes/error but no size. --- include/driver.h | 6 +++--- lib/driver.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/driver.h b/include/driver.h index e1b344cfe3..018bbacee5 100644 --- a/include/driver.h +++ b/include/driver.h @@ -54,7 +54,7 @@ struct driver_d { int (*remove)(struct device_d *); ssize_t (*read) (struct device_d*, void* buf, size_t count, ulong offset, ulong flags); ssize_t (*write) (struct device_d*, const void* buf, size_t count, ulong offset, ulong flags); - ssize_t (*erase) (struct device_d*, size_t count, unsigned long offset); + int (*erase) (struct device_d*, size_t count, unsigned long offset); int (*protect)(struct device_d*, size_t count, unsigned long offset, int prot); int (*memmap)(struct device_d*, void **map, int flags); @@ -109,8 +109,8 @@ struct driver_d *get_driver_by_name(const char *name); ssize_t dev_read(struct device_d *dev, void *buf, size_t count, ulong offset, ulong flags); ssize_t dev_write(struct device_d *dev, const void *buf, size_t count, ulong offset, ulong flags); -ssize_t dev_erase(struct device_d *dev, size_t count, unsigned long offset); -ssize_t dev_protect(struct device_d *dev, size_t count, unsigned long offset, int prot); +int dev_erase(struct device_d *dev, size_t count, unsigned long offset); +int dev_protect(struct device_d *dev, size_t count, unsigned long offset, int prot); int dev_memmap(struct device_d *dev, void **map, int flags); /* These are used by drivers which work with direct memory accesses */ diff --git a/lib/driver.c b/lib/driver.c index 0c560aafb8..1d1e59b2ad 100644 --- a/lib/driver.c +++ b/lib/driver.c @@ -211,7 +211,7 @@ ssize_t dev_write(struct device_d *dev, const void *buf, size_t count, unsigned return -ENOSYS; } -ssize_t dev_erase(struct device_d *dev, size_t count, unsigned long offset) +int dev_erase(struct device_d *dev, size_t count, unsigned long offset) { if (dev->driver->erase) return dev->driver->erase(dev, count, offset); @@ -227,7 +227,7 @@ int dev_protect(struct device_d *dev, size_t count, unsigned long offset, int pr return -ENOSYS; } -ssize_t dev_memmap(struct device_d *dev, void **map, int flags) +int dev_memmap(struct device_d *dev, void **map, int flags) { if (dev->driver->memmap) return dev->driver->memmap(dev, map, flags); -- cgit v1.2.3