These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / mtd / maps / lantiq-flash.c

diff --git a/kernel/drivers/mtd/maps/lantiq-flash.c b/kernel/drivers/mtd/maps/lantiq-flash.c
index 33d26f5..9385205 100644 (file)
--- a/kernel/drivers/mtd/maps/lantiq-flash.c
+++ b/kernel/drivers/mtd/maps/lantiq-flash.c
@@ -45,7 +45,6 @@ struct ltq_mtd {
 };
 
 static const char ltq_map_name[] = "ltq_nor";
-static const char * const ltq_probe_types[] = { "cmdlinepart", "ofpart", NULL };
 
 static map_word
 ltq_read16(struct map_info *map, unsigned long adr)
@@ -161,15 +160,14 @@ ltq_mtd_probe(struct platform_device *pdev)
                return -ENXIO;
        }
 
-       ltq_mtd->mtd->owner = THIS_MODULE;
+       ltq_mtd->mtd->dev.parent = &pdev->dev;
 
        cfi = ltq_mtd->map->fldrv_priv;
        cfi->addr_unlock1 ^= 1;
        cfi->addr_unlock2 ^= 1;
 
        ppdata.of_node = pdev->dev.of_node;
-       err = mtd_device_parse_register(ltq_mtd->mtd, ltq_probe_types,
-                                       &ppdata, NULL, 0);
+       err = mtd_device_parse_register(ltq_mtd->mtd, NULL, &ppdata, NULL, 0);
        if (err) {
                dev_err(&pdev->dev, "failed to add partitions\n");
                goto err_destroy;