sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

mtd: refactor bb device creation 

This refactors the code so that we get a mtd_add_bb which can
be used to create a bb dev on a mtd_info.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2014-04-09 15:59:07 +02:00
parent b32cd8df87
commit 33d4f7cb3d
2 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
drivers/mtd/nand/nand-bb.c
View File

@ -29,6 +29,7 @@
#include <fcntl.h>
#include <libgen.h>
#include <linux/list.h>
#include <linux/err.h>
struct nand_bb {
char *name;
@ -240,6 +241,36 @@ static struct file_operations nand_bb_ops = {
static LIST_HEAD(bb_list);
struct cdev *mtd_add_bb(struct mtd_info *mtd, const char *name)
{
struct nand_bb *bb;
int ret;
bb = xzalloc(sizeof(*bb));
bb->mtd = mtd;
if (name)
bb->cdev.name = xstrdup(name);
else
bb->cdev.name = asprintf("%s.bb", mtd->cdev.name);
nand_bb_calc_size(bb);
bb->cdev.ops = &nand_bb_ops;
bb->cdev.priv = bb;
ret = devfs_create(&bb->cdev);
if (ret)
goto err;
list_add_tail(&bb->list, &bb_list);
return &bb->cdev;
err:
free(bb);
return ERR_PTR(ret);
}
/**
* Add a bad block aware device ontop of another (NAND) device
* @param[in] dev The device to add a partition on
@ -248,9 +279,7 @@ static LIST_HEAD(bb_list);
*/
int dev_add_bb_dev(const char *path, const char *name)
{
struct nand_bb *bb;
struct cdev *parent;
int ret = -ENOMEM;
struct cdev *parent, *cdev;
parent = cdev_by_name(path);
if (!parent)
@ -259,29 +288,9 @@ int dev_add_bb_dev(const char *path, const char *name)
if (!parent->mtd)
return -EINVAL;
bb = xzalloc(sizeof(*bb));
bb->mtd = parent->mtd;
cdev = mtd_add_bb(parent->mtd, name);
if (name)
bb->cdev.name = xstrdup(name);
else
bb->cdev.name = asprintf("%s.bb", path);;
nand_bb_calc_size(bb);
bb->cdev.ops = &nand_bb_ops;
bb->cdev.priv = bb;
ret = devfs_create(&bb->cdev);
if (ret)
goto out4;
list_add_tail(&bb->list, &bb_list);
return 0;
out4:
free(bb);
return ret;
return PTR_ERR(cdev);
}
int dev_remove_bb_dev(const char *name)

6
include/nand.h
View File

@ -7,6 +7,7 @@ struct nand_bb;
#ifdef CONFIG_NAND
int dev_add_bb_dev(const char *filename, const char *name);
int dev_remove_bb_dev(const char *name);
struct cdev *mtd_add_bb(struct mtd_info *mtd, const char *name);
#else
static inline int dev_add_bb_dev(const char *filename, const char *name) {
return 0;
@ -15,6 +16,11 @@ static inline int dev_remove_bb_dev(const char *name)
{
return 0;
}
static inline struct cdev *mtd_add_bb(struct mtd_info *mtd, const char *name)
{
return NULL;
}
#endif
#endif /* __NAND_H__ */