evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mtd: m25p80: convert to mtd_device_register()

Browse source 
Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS
preprocessor conditionals as partitioning is always available.

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:
Jamie Iles 2011-05-23 10:22:57 +01:00 • committed by David Woodhouse
parent 711a632d1f
commit ba52f3a253
1 changed files with 30 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/mtd/devices/m25p80.c
View file

@ -825,6 +825,8 @@ static int __devinit m25p_probe(struct spi_device *spi)
struct m25p *flash; struct m25p *flash;
struct flash_info *info; struct flash_info *info;
unsigned i; unsigned i;
struct mtd_partition *parts = NULL;
int nr_parts = 0;
/* Platform data helps sort out which chip type we have, as /* Platform data helps sort out which chip type we have, as
* well as how this board partitions it. If we don't have * well as how this board partitions it. If we don't have
@ -966,10 +968,6 @@ static int __devinit m25p_probe(struct spi_device *spi)
/* partitions should match sector boundaries; and it may be good to /* partitions should match sector boundaries; and it may be good to
* use readonly partitions for writeprotected sectors (BP2..BP0). * use readonly partitions for writeprotected sectors (BP2..BP0).
*/ */
if (mtd_has_partitions()) {
struct mtd_partition *parts = NULL;
int nr_parts = 0;
if (mtd_has_cmdlinepart()) { if (mtd_has_cmdlinepart()) {
static const char *part_probes[] static const char *part_probes[]
= { "cmdlinepart", NULL, }; = { "cmdlinepart", NULL, };
@ -1001,13 +999,10 @@ static int __devinit m25p_probe(struct spi_device *spi)
(long long)(parts[i].size >> 10)); (long long)(parts[i].size >> 10));
} }
flash->partitioned = 1; flash->partitioned = 1;
return add_mtd_partitions(&flash->mtd, parts, nr_parts);
} }
} else if (data && data->nr_parts)
dev_warn(&spi->dev, "ignoring %d default partitions on %s\n",
data->nr_parts, data->name);
return add_mtd_device(&flash->mtd) == 1 ? -ENODEV : 0; return mtd_device_register(&flash->mtd, parts, nr_parts) == 1 ?
-ENODEV : 0;
} }
@ -1017,10 +1012,7 @@ static int __devexit m25p_remove(struct spi_device *spi)
int status; int status;
/* Clean up MTD stuff. */ /* Clean up MTD stuff. */
if (mtd_has_partitions() && flash->partitioned) status = mtd_device_unregister(&flash->mtd);
status = del_mtd_partitions(&flash->mtd);
else
status = del_mtd_device(&flash->mtd);
if (status == 0) { if (status == 0) {
kfree(flash->command); kfree(flash->command);
kfree(flash); kfree(flash);