aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/devices
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2015-10-30 23:33:26 -0400
committerBrian Norris <computersforpeace@gmail.com>2015-11-11 16:58:51 -0500
commitdf02c885f8697546da41665f28dde5e30ce99674 (patch)
tree64f6fdd615c3830330fbb32dcdd4f03f9be4f952 /drivers/mtd/devices
parenta61ae81a1907af1987ad4c77300508327bc48b23 (diff)
mtd: spi-nor: drop unnecessary partition parser data
Now that the SPI-NOR/MTD framework pass the 'flash_node' through to the partition parsing code, we don't have to do it ourselves. Also convert to mtd_device_register(), since we don't need the 2nd and 3rd parameters anymore. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Diffstat (limited to 'drivers/mtd/devices')
-rw-r--r--drivers/mtd/devices/m25p80.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 556b4554007f..6dbf7832e77a 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -175,7 +175,6 @@ static int m25p80_erase(struct spi_nor *nor, loff_t offset)
175 */ 175 */
176static int m25p_probe(struct spi_device *spi) 176static int m25p_probe(struct spi_device *spi)
177{ 177{
178 struct mtd_part_parser_data ppdata;
179 struct flash_platform_data *data; 178 struct flash_platform_data *data;
180 struct m25p *flash; 179 struct m25p *flash;
181 struct spi_nor *nor; 180 struct spi_nor *nor;
@@ -227,11 +226,8 @@ static int m25p_probe(struct spi_device *spi)
227 if (ret) 226 if (ret)
228 return ret; 227 return ret;
229 228
230 ppdata.of_node = spi->dev.of_node; 229 return mtd_device_register(&nor->mtd, data ? data->parts : NULL,
231 230 data ? data->nr_parts : 0);
232 return mtd_device_parse_register(&nor->mtd, NULL, &ppdata,
233 data ? data->parts : NULL,
234 data ? data->nr_parts : 0);
235} 231}
236 232
237 233