mirror of
https://github.com/torvalds/linux.git
synced 2024-11-14 16:12:02 +00:00
mtd: impa7.c: use mtd_device_parse_register
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. Artem: rename static_partitions to make lines shorter and align the way this driver prefers. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
parent
8db2a08ee4
commit
5003403b87
@ -49,7 +49,7 @@ static struct map_info impa7_map[NUM_FLASHBANKS] = {
|
||||
/*
|
||||
* MTD partitioning stuff
|
||||
*/
|
||||
static struct mtd_partition static_partitions[] =
|
||||
static struct mtd_partition partitions[] =
|
||||
{
|
||||
{
|
||||
.name = "FileSystem",
|
||||
@ -58,15 +58,10 @@ static struct mtd_partition static_partitions[] =
|
||||
},
|
||||
};
|
||||
|
||||
static int mtd_parts_nb[NUM_FLASHBANKS];
|
||||
static struct mtd_partition *mtd_parts[NUM_FLASHBANKS];
|
||||
|
||||
|
||||
static int __init init_impa7(void)
|
||||
{
|
||||
static const char *rom_probe_types[] = PROBETYPES;
|
||||
const char **type;
|
||||
const char *part_type = 0;
|
||||
int i;
|
||||
static struct { u_long addr; u_long size; } pt[NUM_FLASHBANKS] = {
|
||||
{ WINDOW_ADDR0, WINDOW_SIZE0 },
|
||||
@ -96,23 +91,9 @@ static int __init init_impa7(void)
|
||||
if (impa7_mtd[i]) {
|
||||
impa7_mtd[i]->owner = THIS_MODULE;
|
||||
devicesfound++;
|
||||
mtd_parts_nb[i] = parse_mtd_partitions(impa7_mtd[i],
|
||||
NULL,
|
||||
&mtd_parts[i],
|
||||
0);
|
||||
if (mtd_parts_nb[i] > 0) {
|
||||
part_type = "command line";
|
||||
} else {
|
||||
mtd_parts[i] = static_partitions;
|
||||
mtd_parts_nb[i] = ARRAY_SIZE(static_partitions);
|
||||
part_type = "static";
|
||||
}
|
||||
|
||||
printk(KERN_NOTICE MSG_PREFIX
|
||||
"using %s partition definition\n",
|
||||
part_type);
|
||||
mtd_device_register(impa7_mtd[i],
|
||||
mtd_parts[i], mtd_parts_nb[i]);
|
||||
mtd_device_parse_register(impa7_mtd[i], NULL, 0,
|
||||
partitions,
|
||||
ARRAY_SIZE(partitions));
|
||||
}
|
||||
else
|
||||
iounmap((void *)impa7_map[i].virt);
|
||||
|
Loading…
Reference in New Issue
Block a user