diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2018-07-13 05:27:33 -0400 |
---|---|---|
committer | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-07-18 10:32:36 -0400 |
commit | 4897015d2ffb78c3064eeffa2d4022c5be3ea18f (patch) | |
tree | f6cc4e4ae92445dd0e241b0ec736b7791d00b40e | |
parent | 9ea97a7d689c55a5528bfaad499edf1a4ca02e2a (diff) |
mtd: maps: use mtd_device_register() where applicable
If driver doesn't specify parsers it can use that little helper.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
-rw-r--r-- | drivers/mtd/maps/impa7.c | 5 | ||||
-rw-r--r-- | drivers/mtd/maps/intel_vr_nor.c | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/latch-addr-flash.c | 5 | ||||
-rw-r--r-- | drivers/mtd/maps/rbtx4939-flash.c | 3 |
4 files changed, 6 insertions, 9 deletions
diff --git a/drivers/mtd/maps/impa7.c b/drivers/mtd/maps/impa7.c index a0b8fa7849a9..815e2db87955 100644 --- a/drivers/mtd/maps/impa7.c +++ b/drivers/mtd/maps/impa7.c | |||
@@ -88,9 +88,8 @@ static int __init init_impa7(void) | |||
88 | if (impa7_mtd[i]) { | 88 | if (impa7_mtd[i]) { |
89 | impa7_mtd[i]->owner = THIS_MODULE; | 89 | impa7_mtd[i]->owner = THIS_MODULE; |
90 | devicesfound++; | 90 | devicesfound++; |
91 | mtd_device_parse_register(impa7_mtd[i], NULL, NULL, | 91 | mtd_device_register(impa7_mtd[i], partitions, |
92 | partitions, | 92 | ARRAY_SIZE(partitions)); |
93 | ARRAY_SIZE(partitions)); | ||
94 | } else { | 93 | } else { |
95 | iounmap((void __iomem *)impa7_map[i].virt); | 94 | iounmap((void __iomem *)impa7_map[i].virt); |
96 | } | 95 | } |
diff --git a/drivers/mtd/maps/intel_vr_nor.c b/drivers/mtd/maps/intel_vr_nor.c index dd5d6855f543..69503aef981e 100644 --- a/drivers/mtd/maps/intel_vr_nor.c +++ b/drivers/mtd/maps/intel_vr_nor.c | |||
@@ -71,7 +71,7 @@ static int vr_nor_init_partitions(struct vr_nor_mtd *p) | |||
71 | { | 71 | { |
72 | /* register the flash bank */ | 72 | /* register the flash bank */ |
73 | /* partition the flash bank */ | 73 | /* partition the flash bank */ |
74 | return mtd_device_parse_register(p->info, NULL, NULL, NULL, 0); | 74 | return mtd_device_register(p->info, NULL, 0); |
75 | } | 75 | } |
76 | 76 | ||
77 | static void vr_nor_destroy_mtd_setup(struct vr_nor_mtd *p) | 77 | static void vr_nor_destroy_mtd_setup(struct vr_nor_mtd *p) |
diff --git a/drivers/mtd/maps/latch-addr-flash.c b/drivers/mtd/maps/latch-addr-flash.c index 6dc97aa667dc..51db24b7f88d 100644 --- a/drivers/mtd/maps/latch-addr-flash.c +++ b/drivers/mtd/maps/latch-addr-flash.c | |||
@@ -197,9 +197,8 @@ static int latch_addr_flash_probe(struct platform_device *dev) | |||
197 | } | 197 | } |
198 | info->mtd->dev.parent = &dev->dev; | 198 | info->mtd->dev.parent = &dev->dev; |
199 | 199 | ||
200 | mtd_device_parse_register(info->mtd, NULL, NULL, | 200 | mtd_device_register(info->mtd, latch_addr_data->parts, |
201 | latch_addr_data->parts, | 201 | latch_addr_data->nr_parts); |
202 | latch_addr_data->nr_parts); | ||
203 | return 0; | 202 | return 0; |
204 | 203 | ||
205 | iounmap: | 204 | iounmap: |
diff --git a/drivers/mtd/maps/rbtx4939-flash.c b/drivers/mtd/maps/rbtx4939-flash.c index 3a06ecfc55ff..80a187167c92 100644 --- a/drivers/mtd/maps/rbtx4939-flash.c +++ b/drivers/mtd/maps/rbtx4939-flash.c | |||
@@ -97,8 +97,7 @@ static int rbtx4939_flash_probe(struct platform_device *dev) | |||
97 | goto err_out; | 97 | goto err_out; |
98 | } | 98 | } |
99 | info->mtd->dev.parent = &dev->dev; | 99 | info->mtd->dev.parent = &dev->dev; |
100 | err = mtd_device_parse_register(info->mtd, NULL, NULL, pdata->parts, | 100 | err = mtd_device_register(info->mtd, pdata->parts, pdata->nr_parts); |
101 | pdata->nr_parts); | ||
102 | 101 | ||
103 | if (err) | 102 | if (err) |
104 | goto err_out; | 103 | goto err_out; |