diff options
| author | Heiko Schocher <hs@denx.de> | 2014-07-15 16:08:42 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-08-25 19:25:56 -0400 |
| commit | ddf7bcfa6c5a1d9647046c18e4945f0b0686aec5 (patch) | |
| tree | 5aacb15745d27f8a2a9565b4441f4170817841cc | |
| parent | ff94bc40af3481d47546595ba73c136de6af6929 (diff) | |
| download | talos-obmc-uboot-ddf7bcfa6c5a1d9647046c18e4945f0b0686aec5.tar.gz talos-obmc-uboot-ddf7bcfa6c5a1d9647046c18e4945f0b0686aec5.zip | |
mtd, ubi, ubifs: update for the sync with linux v3.14
while playing with the new mtd/ubi/ubifs sync, found some
small updates for it:
- add del_mtd_partition() to include/linux/mtd/mtd
- mtd: add a debug_printf
- remove some not used functions
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Tom Rini <trini@ti.com>
| -rw-r--r-- | drivers/mtd/mtdcore.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/mtdpart.c | 2 | ||||
| -rw-r--r-- | fs/ubifs/super.c | 6 | ||||
| -rw-r--r-- | include/linux/mtd/mtd.h | 1 |
4 files changed, 11 insertions, 0 deletions
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 796ac0729e..bdb94ce5ad 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -476,6 +476,8 @@ int add_mtd_device(struct mtd_info *mtd) the notifier, since we hold the mtd_table_mutex */ list_for_each_entry(not, &mtd_notifiers, list) not->add(mtd); +#else + pr_debug("mtd: Giving out device %d to %s\n", i, mtd->name); #endif mutex_unlock(&mtd_table_mutex); diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index d20b8578e7..3dc47b3c0e 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -572,6 +572,7 @@ out_register: return slave; } +#ifndef __UBOOT__ int mtd_add_partition(struct mtd_info *master, const char *name, long long offset, long long length) { @@ -651,6 +652,7 @@ int mtd_del_partition(struct mtd_info *master, int partno) return ret; } EXPORT_SYMBOL_GPL(mtd_del_partition); +#endif /* * This function, given a master MTD object and a partition table, creates diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 9c87db40d3..5f53691428 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -2241,8 +2241,14 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) int err; c->vfs_sb = sb; +#ifndef __UBOOT__ /* Re-open the UBI device in read-write mode */ c->ubi = ubi_open_volume(c->vi.ubi_num, c->vi.vol_id, UBI_READWRITE); +#else + /* U-Boot read only mode */ + c->ubi = ubi_open_volume(c->vi.ubi_num, c->vi.vol_id, UBI_READONLY); +#endif + if (IS_ERR(c->ubi)) { err = PTR_ERR(c->ubi); goto out; diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index b7b47570ea..e6cfd559eb 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -480,6 +480,7 @@ static inline int mtd_is_bitflip_or_eccerr(int err) { #ifdef __UBOOT__ /* drivers/mtd/mtdcore.h */ int add_mtd_device(struct mtd_info *mtd); +int del_mtd_device(struct mtd_info *mtd); int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int); int del_mtd_partitions(struct mtd_info *); #endif |
