diff options
author | Sandeep S. Trasi <strasi@nvidia.com> | 2012-08-14 21:32:26 +0530 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 01:32:11 -0700 |
commit | bd042e67cfe664c2c79d0add582addeae5e6ef16 (patch) | |
tree | 7e31b7eef9673655880d9adc0fc4bdc170dd1d7e /drivers/mtd/maps | |
parent | 8729b019eb988b25211387b6b1e2117f567b086c (diff) |
mtd: tegra-nor: Fix build with kernel 3.4
Replace internal function parse_mtd_partitions()
with new api mtd_device_parse_register()
Change-Id: Ic01543ed3e21d347e2ae24645d36fdc6b99f5273
Signed-off-by: Sandeep S. Trasi <strasi@nvidia.com>
Reviewed-on: http://git-master/r/123384
Tested-by: Bob Johnston <bjohnston@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Rebase-Id: R473bb07ba3fed0b4ad64df6e6202d8f461714351
Diffstat (limited to 'drivers/mtd/maps')
-rw-r--r-- | drivers/mtd/maps/tegra_nor.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/mtd/maps/tegra_nor.c b/drivers/mtd/maps/tegra_nor.c index a270e8d97234..545739a1778a 100644 --- a/drivers/mtd/maps/tegra_nor.c +++ b/drivers/mtd/maps/tegra_nor.c @@ -417,15 +417,7 @@ static int tegra_nor_probe(struct platform_device *pdev) info->parts = NULL; platform_set_drvdata(pdev, info); - err = parse_mtd_partitions(info->mtd, part_probes, &info->parts, 0); - if (err > 0) - err = mtd_device_register(info->mtd, info->parts, err); - else if (err <= 0 && plat->flash.parts) - err = - mtd_device_register(info->mtd, plat->flash.parts, - plat->flash.nr_parts); - else - mtd_device_register(info->mtd, NULL, 0); + mtd_device_parse_register(info->mtd, part_probes, NULL, info->parts, 0); return 0; |