mtd: cris: convert to mtd_device_register()
Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS preprocessor conditionals as partitioning is always available. Cc: Mikael Starvik <starvik@axis.com> Cc: Jesper Nilsson <jesper.nilsson@axis.com> Signed-off-by: Jamie Iles <jamie@jamieiles.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
parent
fee88c58c7
commit
36cda05b37
|
@ -274,7 +274,6 @@ config ETRAX_AXISFLASHMAP
|
||||||
select MTD_JEDECPROBE if ETRAX_ARCH_V32
|
select MTD_JEDECPROBE if ETRAX_ARCH_V32
|
||||||
select MTD_CHAR
|
select MTD_CHAR
|
||||||
select MTD_BLOCK
|
select MTD_BLOCK
|
||||||
select MTD_PARTITIONS
|
|
||||||
select MTD_COMPLEX_MAPPINGS
|
select MTD_COMPLEX_MAPPINGS
|
||||||
help
|
help
|
||||||
This option enables MTD mapping of flash devices. Needed to use
|
This option enables MTD mapping of flash devices. Needed to use
|
||||||
|
|
|
@ -372,7 +372,7 @@ static int __init init_axis_flash(void)
|
||||||
#ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE
|
#ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE
|
||||||
if (mymtd) {
|
if (mymtd) {
|
||||||
main_partition.size = mymtd->size;
|
main_partition.size = mymtd->size;
|
||||||
err = add_mtd_partitions(mymtd, &main_partition, 1);
|
err = mtd_device_register(mymtd, &main_partition, 1);
|
||||||
if (err)
|
if (err)
|
||||||
panic("axisflashmap: Could not initialize "
|
panic("axisflashmap: Could not initialize "
|
||||||
"partition for whole main mtd device!\n");
|
"partition for whole main mtd device!\n");
|
||||||
|
@ -382,10 +382,12 @@ static int __init init_axis_flash(void)
|
||||||
if (mymtd) {
|
if (mymtd) {
|
||||||
if (use_default_ptable) {
|
if (use_default_ptable) {
|
||||||
printk(KERN_INFO " Using default partition table.\n");
|
printk(KERN_INFO " Using default partition table.\n");
|
||||||
err = add_mtd_partitions(mymtd, axis_default_partitions,
|
err = mtd_device_register(mymtd,
|
||||||
NUM_DEFAULT_PARTITIONS);
|
axis_default_partitions,
|
||||||
|
NUM_DEFAULT_PARTITIONS);
|
||||||
} else {
|
} else {
|
||||||
err = add_mtd_partitions(mymtd, axis_partitions, pidx);
|
err = mtd_device_register(mymtd, axis_partitions,
|
||||||
|
pidx);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (err)
|
if (err)
|
||||||
|
|
|
@ -405,7 +405,6 @@ config ETRAX_AXISFLASHMAP
|
||||||
select MTD_JEDECPROBE
|
select MTD_JEDECPROBE
|
||||||
select MTD_CHAR
|
select MTD_CHAR
|
||||||
select MTD_BLOCK
|
select MTD_BLOCK
|
||||||
select MTD_PARTITIONS
|
|
||||||
select MTD_COMPLEX_MAPPINGS
|
select MTD_COMPLEX_MAPPINGS
|
||||||
help
|
help
|
||||||
This option enables MTD mapping of flash devices. Needed to use
|
This option enables MTD mapping of flash devices. Needed to use
|
||||||
|
|
|
@ -561,7 +561,7 @@ static int __init init_axis_flash(void)
|
||||||
#ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE
|
#ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE
|
||||||
if (main_mtd) {
|
if (main_mtd) {
|
||||||
main_partition.size = main_mtd->size;
|
main_partition.size = main_mtd->size;
|
||||||
err = add_mtd_partitions(main_mtd, &main_partition, 1);
|
err = mtd_device_register(main_mtd, &main_partition, 1);
|
||||||
if (err)
|
if (err)
|
||||||
panic("axisflashmap: Could not initialize "
|
panic("axisflashmap: Could not initialize "
|
||||||
"partition for whole main mtd device!\n");
|
"partition for whole main mtd device!\n");
|
||||||
|
@ -597,7 +597,8 @@ static int __init init_axis_flash(void)
|
||||||
mtd_ram->erasesize = (main_mtd ? main_mtd->erasesize :
|
mtd_ram->erasesize = (main_mtd ? main_mtd->erasesize :
|
||||||
CONFIG_ETRAX_PTABLE_SECTOR);
|
CONFIG_ETRAX_PTABLE_SECTOR);
|
||||||
} else {
|
} else {
|
||||||
err = add_mtd_partitions(main_mtd, &partition[part], 1);
|
err = mtd_device_register(main_mtd, &partition[part],
|
||||||
|
1);
|
||||||
if (err)
|
if (err)
|
||||||
panic("axisflashmap: Could not add mtd "
|
panic("axisflashmap: Could not add mtd "
|
||||||
"partition %d\n", part);
|
"partition %d\n", part);
|
||||||
|
@ -633,7 +634,7 @@ static int __init init_axis_flash(void)
|
||||||
#ifndef CONFIG_ETRAX_VCS_SIM
|
#ifndef CONFIG_ETRAX_VCS_SIM
|
||||||
if (aux_mtd) {
|
if (aux_mtd) {
|
||||||
aux_partition.size = aux_mtd->size;
|
aux_partition.size = aux_mtd->size;
|
||||||
err = add_mtd_partitions(aux_mtd, &aux_partition, 1);
|
err = mtd_device_register(aux_mtd, &aux_partition, 1);
|
||||||
if (err)
|
if (err)
|
||||||
panic("axisflashmap: Could not initialize "
|
panic("axisflashmap: Could not initialize "
|
||||||
"aux mtd device!\n");
|
"aux mtd device!\n");
|
||||||
|
|
Loading…
Reference in a new issue