diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-06-28 13:33:28 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-07-05 15:07:14 +0200 |
| commit | e0677920d6e61e246d6906cd931263d35292dc7e (patch) | |
| tree | a90eb89efef852773cd6ff041d7e48759890147f /drivers/mtd/ubi/vmt.c | |
| parent | 8dbed40da9c07f106246584e91980dba856dad1e (diff) | |
| download | barebox-e0677920d6e61e246d6906cd931263d35292dc7e.tar.gz barebox-e0677920d6e61e246d6906cd931263d35292dc7e.tar.xz | |
barebox ubi changes
This adds the layer between barebox and UBI.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd/ubi/vmt.c')
| -rw-r--r-- | drivers/mtd/ubi/vmt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c index 935dcdc9ac..4f1d0f4209 100644 --- a/drivers/mtd/ubi/vmt.c +++ b/drivers/mtd/ubi/vmt.c @@ -323,7 +323,7 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req) vol->cdev.owner = THIS_MODULE; #endif dev = MKDEV(MAJOR(ubi->cdev.dev), vol_id + 1); - err = cdev_add(&vol->cdev, dev, 1); + err = ubi_volume_cdev_add(ubi, vol); if (err) { ubi_err("cannot add character device"); goto out_mapping; @@ -390,7 +390,7 @@ out_gluebi: dbg_err("cannot destroy gluebi for volume %d:%d", ubi->ubi_num, vol_id); out_cdev: - cdev_del(&vol->cdev); + ubi_volume_cdev_remove(vol); out_mapping: kfree(vol->eba_tbl); out_acc: @@ -457,7 +457,7 @@ int ubi_remove_volume(struct ubi_volume_desc *desc) kfree(vol->eba_tbl); vol->eba_tbl = NULL; - cdev_del(&vol->cdev); + ubi_volume_cdev_remove(vol); volume_sysfs_close(vol); spin_lock(&ubi->volumes_lock); @@ -634,7 +634,7 @@ int ubi_add_volume(struct ubi_device *ubi, struct ubi_volume *vol) vol->cdev.owner = THIS_MODULE; #endif dev = MKDEV(MAJOR(ubi->cdev.dev), vol->vol_id + 1); - err = cdev_add(&vol->cdev, dev, 1); + err = ubi_volume_cdev_add(ubi, vol); if (err) { ubi_err("cannot add character device for volume %d, error %d", vol_id, err); @@ -656,7 +656,7 @@ int ubi_add_volume(struct ubi_device *ubi, struct ubi_volume *vol) err = volume_sysfs_init(ubi, vol); if (err) { - cdev_del(&vol->cdev); + ubi_volume_cdev_remove(vol); err = ubi_destroy_gluebi(vol); volume_sysfs_close(vol); return err; @@ -668,7 +668,7 @@ int ubi_add_volume(struct ubi_device *ubi, struct ubi_volume *vol) out_gluebi: err = ubi_destroy_gluebi(vol); out_cdev: - cdev_del(&vol->cdev); + ubi_volume_cdev_remove(vol); return err; } @@ -688,7 +688,7 @@ void ubi_free_volume(struct ubi_device *ubi, struct ubi_volume *vol) ubi->volumes[vol->vol_id] = NULL; err = ubi_destroy_gluebi(vol); - cdev_del(&vol->cdev); + ubi_volume_cdev_remove(vol); volume_sysfs_close(vol); } |