diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-05 12:59:29 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-05 12:59:29 +0200 |
commit | 6cb993c0cd0644d7b559cda6b84e4c196fc029dc (patch) | |
tree | 6352370a890c86aa062a31c075212f7a7bcf38f0 /drivers | |
parent | d7257236a770398fb9d54cb138a0fa44ddfdc3dc (diff) | |
parent | 83f311a9bb4dd79c2e8705cf5bdf095e3f624442 (diff) | |
download | barebox-6cb993c0cd0644d7b559cda6b84e4c196fc029dc.tar.gz barebox-6cb993c0cd0644d7b559cda6b84e4c196fc029dc.tar.xz |
Merge branch 'for-next/mtd'
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mtd/core.c | 12 | ||||
-rw-r--r-- | drivers/mtd/mtd.h | 5 | ||||
-rw-r--r-- | drivers/mtd/mtdoob.c | 15 | ||||
-rw-r--r-- | drivers/mtd/mtdraw.c | 19 |
4 files changed, 40 insertions, 11 deletions
diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c index 5510439a87..a6132e8ac5 100644 --- a/drivers/mtd/core.c +++ b/drivers/mtd/core.c @@ -79,7 +79,7 @@ static ssize_t mtd_write(struct cdev* cdev, const void *buf, size_t _count, return -EINVAL; } - dev_dbg(cdev->dev, "write: 0x%08lx 0x%08x\n", offset, count); + dev_dbg(cdev->dev, "write: 0x%08lx 0x%08lx\n", offset, count); while (count) { now = count > mtd->writesize ? mtd->writesize : count; @@ -100,7 +100,7 @@ static ssize_t mtd_write(struct cdev* cdev, const void *buf, size_t _count, ret = mtd->write(mtd, offset, now, &retlen, buf); dev_dbg(cdev->dev, - "offset: 0x%08lx now: 0x%08x retlen: 0x%08x\n", + "offset: 0x%08lx now: 0x%08lx retlen: 0x%08lx\n", offset, now, retlen); } if (ret) @@ -174,7 +174,7 @@ int mtd_ioctl(struct cdev *cdev, int request, void *buf) } #ifdef CONFIG_MTD_WRITE -static ssize_t mtd_erase(struct cdev *cdev, size_t count, loff_t offset) +static int mtd_erase(struct cdev *cdev, size_t count, loff_t offset) { struct mtd_info *mtd = cdev->priv; struct erase_info erase; @@ -248,7 +248,7 @@ int add_mtd_device(struct mtd_info *mtd, char *devname) list_for_each_entry(hook, &mtd_register_hooks, hook) if (hook->add_mtd_device) - hook->add_mtd_device(mtd, devname); + hook->add_mtd_device(mtd, devname, &hook->priv); return 0; } @@ -259,7 +259,9 @@ int del_mtd_device (struct mtd_info *mtd) list_for_each_entry(hook, &mtd_register_hooks, hook) if (hook->del_mtd_device) - hook->del_mtd_device(mtd); + hook->del_mtd_device(mtd, &hook->priv); + + devfs_remove(&mtd->cdev); unregister_device(&mtd->class_dev); free(mtd->param_size.value); free(mtd->cdev.name); diff --git a/drivers/mtd/mtd.h b/drivers/mtd/mtd.h index c8af6e3c9d..414bd6cdb5 100644 --- a/drivers/mtd/mtd.h +++ b/drivers/mtd/mtd.h @@ -25,8 +25,9 @@ */ struct mtddev_hook { struct list_head hook; - int (*add_mtd_device)(struct mtd_info *mtd, char *devname); - int (*del_mtd_device)(struct mtd_info *mtd); + int (*add_mtd_device)(struct mtd_info *mtd, char *devname, void **priv); + int (*del_mtd_device)(struct mtd_info *mtd, void **priv); + void *priv; }; struct cdev; diff --git a/drivers/mtd/mtdoob.c b/drivers/mtd/mtdoob.c index e4dd1a00c8..c7bf40cef8 100644 --- a/drivers/mtd/mtdoob.c +++ b/drivers/mtd/mtdoob.c @@ -69,7 +69,7 @@ static struct file_operations mtd_ops_oob = { .lseek = dev_lseek_default, }; -static int add_mtdoob_device(struct mtd_info *mtd, char *devname) +static int add_mtdoob_device(struct mtd_info *mtd, char *devname, void **priv) { struct mtdoob *mtdoob; @@ -80,13 +80,26 @@ static int add_mtdoob_device(struct mtd_info *mtd, char *devname) mtdoob->cdev.priv = mtdoob; mtdoob->cdev.dev = &mtd->class_dev; mtdoob->mtd = mtd; + *priv = mtdoob; devfs_create(&mtdoob->cdev); return 0; } +static int del_mtdoob_device(struct mtd_info *mtd, void **priv) +{ + struct mtdoob *mtdoob; + + mtdoob = *priv; + devfs_remove(&mtdoob->cdev); + free(mtdoob); + + return 0; +} + static struct mtddev_hook mtdoob_hook = { .add_mtd_device = add_mtdoob_device, + .del_mtd_device = del_mtdoob_device, }; static int __init register_mtdoob(void) diff --git a/drivers/mtd/mtdraw.c b/drivers/mtd/mtdraw.c index 24f7358098..16157e9f48 100644 --- a/drivers/mtd/mtdraw.c +++ b/drivers/mtd/mtdraw.c @@ -137,7 +137,7 @@ static ssize_t mtdraw_read(struct cdev *cdev, void *buf, size_t count, retlen += ret; } if (ret < 0) - printf("err %d\n", ret); + printf("err %lu\n", ret); else ret = retlen; return ret; @@ -222,7 +222,7 @@ static ssize_t mtdraw_write(struct cdev *cdev, const void *buf, size_t count, } } -static ssize_t mtdraw_erase(struct cdev *cdev, size_t count, loff_t _offset) +static int mtdraw_erase(struct cdev *cdev, size_t count, loff_t _offset) { struct mtd_info *mtd = to_mtd(cdev); struct erase_info erase; @@ -275,7 +275,7 @@ static const struct file_operations mtd_raw_fops = { .lseek = dev_lseek_default, }; -static int add_mtdraw_device(struct mtd_info *mtd, char *devname) +static int add_mtdraw_device(struct mtd_info *mtd, char *devname, void **priv) { struct mtdraw *mtdraw; @@ -290,13 +290,26 @@ static int add_mtdraw_device(struct mtd_info *mtd, char *devname) mtdraw->cdev.priv = mtdraw; mtdraw->cdev.dev = &mtd->class_dev; mtdraw->cdev.mtd = mtd; + *priv = mtdraw; devfs_create(&mtdraw->cdev); return 0; } +static int del_mtdraw_device(struct mtd_info *mtd, void **priv) +{ + struct mtdraw *mtdraw; + + mtdraw = *priv; + devfs_remove(&mtdraw->cdev); + free(mtdraw); + + return 0; +} + static struct mtddev_hook mtdraw_hook = { .add_mtd_device = add_mtdraw_device, + .del_mtd_device = del_mtdraw_device, }; static int __init register_mtdraw(void) |