|
@@ -295,8 +295,6 @@ static int __devinit jz_nand_probe(struct platform_device *pdev)
|
|
|
struct nand_chip *chip;
|
|
|
struct mtd_info *mtd;
|
|
|
struct jz_nand_platform_data *pdata = pdev->dev.platform_data;
|
|
|
- struct mtd_partition *partition_info;
|
|
|
- int num_partitions = 0;
|
|
|
|
|
|
nand = kzalloc(sizeof(*nand), GFP_KERNEL);
|
|
|
if (!nand) {
|
|
@@ -369,12 +367,9 @@ static int __devinit jz_nand_probe(struct platform_device *pdev)
|
|
|
goto err_gpio_free;
|
|
|
}
|
|
|
|
|
|
- num_partitions = parse_mtd_partitions(mtd, NULL, &partition_info, 0);
|
|
|
- if (num_partitions <= 0 && pdata) {
|
|
|
- num_partitions = pdata->num_partitions;
|
|
|
- partition_info = pdata->partitions;
|
|
|
- }
|
|
|
- ret = mtd_device_register(mtd, partition_info, num_partitions);
|
|
|
+ ret = mtd_device_parse_register(mtd, NULL, 0,
|
|
|
+ pdata ? pdata->partitions : NULL,
|
|
|
+ pdata ? pdata->num_partitions : 0);
|
|
|
|
|
|
if (ret) {
|
|
|
dev_err(&pdev->dev, "Failed to add mtd device\n");
|