Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-13 06:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

mtd: ppchameleonevb.c: use mtd_device_parse_register

Browse Source 
Replace custom invocations of parse_mtd_partitions and mtd_device_register
with common mtd_device_parse_register call. This would bring: standard
handling of all errors, fallback to default partitions, etc.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
Dmitry Eremin-Solenikov 2011-06-02 18:00:58 +04:00 committed by Artem Bityutskiy
parent 009c840770
commit 725b75a4ac
1 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/mtd/nand/ppchameleonevb.c
View File

@ -191,9 +191,6 @@ static int ppchameleonevb_device_ready(struct mtd_info *minfo)
static int __init ppchameleonevb_init(void) static int __init ppchameleonevb_init(void)
{ {
struct nand_chip *this; struct nand_chip *this;
const char *part_type = 0;
int mtd_parts_nb = 0;
struct mtd_partition *mtd_parts = 0;
void __iomem *ppchameleon_fio_base; void __iomem *ppchameleon_fio_base;
void __iomem *ppchameleonevb_fio_base; void __iomem *ppchameleonevb_fio_base;
@ -276,24 +273,13 @@ static int __init ppchameleonevb_init(void)
#endif #endif
ppchameleon_mtd->name = "ppchameleon-nand"; ppchameleon_mtd->name = "ppchameleon-nand";
mtd_parts_nb = parse_mtd_partitions(ppchameleon_mtd, NULL, &mtd_parts, 0);
if (mtd_parts_nb > 0)
part_type = "command line";
else
mtd_parts_nb = 0;
if (mtd_parts_nb == 0) {
if (ppchameleon_mtd->size == NAND_SMALL_SIZE)
mtd_parts = partition_info_me;
else
mtd_parts = partition_info_hi;
mtd_parts_nb = NUM_PARTITIONS;
part_type = "static";
}
/* Register the partitions */ /* Register the partitions */
printk(KERN_NOTICE "Using %s partition definition\n", part_type); mtd_device_parse_register(ppchameleon_mtd, NULL, 0,
mtd_device_register(ppchameleon_mtd, mtd_parts, mtd_parts_nb); ppchameleon_mtd->size == NAND_SMALL_SIZE ?
partition_info_me :
partition_info_hi,
NUM_PARTITIONS);
nand_evb_init: nand_evb_init:
/**************************** /****************************
@ -377,21 +363,13 @@ static int __init ppchameleonevb_init(void)
} }
ppchameleonevb_mtd->name = NAND_EVB_MTD_NAME; ppchameleonevb_mtd->name = NAND_EVB_MTD_NAME;
mtd_parts_nb = parse_mtd_partitions(ppchameleonevb_mtd, NULL, &mtd_parts, 0);
if (mtd_parts_nb > 0)
part_type = "command line";
else
mtd_parts_nb = 0;
if (mtd_parts_nb == 0) {
mtd_parts = partition_info_evb;
mtd_parts_nb = NUM_PARTITIONS;
part_type = "static";
}
/* Register the partitions */ /* Register the partitions */
printk(KERN_NOTICE "Using %s partition definition\n", part_type); mtd_device_parse_register(ppchameleonevb_mtd, NULL, 0,
mtd_device_register(ppchameleonevb_mtd, mtd_parts, mtd_parts_nb); ppchameleon_mtd->size == NAND_SMALL_SIZE ?
partition_info_me :
partition_info_hi,
NUM_PARTITIONS);
/* Return happy */ /* Return happy */
return 0; return 0;