Commit 6baed700 authored by Jamie Iles's avatar Jamie Iles Committed by David Woodhouse

mtd: sharpsl: convert to mtd_device_register()

Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS
preprocessor conditionals as partitioning is always available.
Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent af86ea8f
...@@ -103,9 +103,7 @@ static int sharpsl_nand_calculate_ecc(struct mtd_info *mtd, const u_char * dat, ...@@ -103,9 +103,7 @@ static int sharpsl_nand_calculate_ecc(struct mtd_info *mtd, const u_char * dat,
return readb(sharpsl->io + ECCCNTR) != 0; return readb(sharpsl->io + ECCCNTR) != 0;
} }
#ifdef CONFIG_MTD_PARTITIONS
static const char *part_probes[] = { "cmdlinepart", NULL }; static const char *part_probes[] = { "cmdlinepart", NULL };
#endif
/* /*
* Main initialization routine * Main initialization routine
...@@ -113,10 +111,8 @@ static const char *part_probes[] = { "cmdlinepart", NULL }; ...@@ -113,10 +111,8 @@ static const char *part_probes[] = { "cmdlinepart", NULL };
static int __devinit sharpsl_nand_probe(struct platform_device *pdev) static int __devinit sharpsl_nand_probe(struct platform_device *pdev)
{ {
struct nand_chip *this; struct nand_chip *this;
#ifdef CONFIG_MTD_PARTITIONS
struct mtd_partition *sharpsl_partition_info; struct mtd_partition *sharpsl_partition_info;
int nr_partitions; int nr_partitions;
#endif
struct resource *r; struct resource *r;
int err = 0; int err = 0;
struct sharpsl_nand *sharpsl; struct sharpsl_nand *sharpsl;
...@@ -188,18 +184,14 @@ static int __devinit sharpsl_nand_probe(struct platform_device *pdev) ...@@ -188,18 +184,14 @@ static int __devinit sharpsl_nand_probe(struct platform_device *pdev)
/* Register the partitions */ /* Register the partitions */
sharpsl->mtd.name = "sharpsl-nand"; sharpsl->mtd.name = "sharpsl-nand";
#ifdef CONFIG_MTD_PARTITIONS
nr_partitions = parse_mtd_partitions(&sharpsl->mtd, part_probes, &sharpsl_partition_info, 0); nr_partitions = parse_mtd_partitions(&sharpsl->mtd, part_probes, &sharpsl_partition_info, 0);
if (nr_partitions <= 0) { if (nr_partitions <= 0) {
nr_partitions = data->nr_partitions; nr_partitions = data->nr_partitions;
sharpsl_partition_info = data->partitions; sharpsl_partition_info = data->partitions;
} }
if (nr_partitions > 0) err = mtd_device_register(&sharpsl->mtd, sharpsl_partition_info,
err = add_mtd_partitions(&sharpsl->mtd, sharpsl_partition_info, nr_partitions); nr_partitions);
else
#endif
err = add_mtd_device(&sharpsl->mtd);
if (err) if (err)
goto err_add; goto err_add;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment