mtd: m25p80: Call spi_mem_get_name() to let controller set a custom name

By calling spi_mem_get_name(), the driver of the (Q)SPI controller can
set a custom name for the memory device if necessary.
This is useful to keep mtdparts compatible when controller drivers are
ported from the MTD to the SPI layer.

Suggested-by: Boris Brezillon <[email protected]>
Signed-off-by: Frieder Schrempf <[email protected]>
Acked-by: Boris Brezillon <[email protected]>
Signed-off-by: Mark Brown <[email protected]>

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index e84563d2067f4fe28c1f0ed21defda049323dd36..aac48800821627b6bf44ecef1216412321182be8 100644 (file)
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -202,6 +202,9 @@ static int m25p_probe(struct spi_mem *spimem)
        if (data && data->name)
                nor->mtd.name = data->name;
 
+       if (!nor->mtd.name)
+               nor->mtd.name = spi_mem_get_name(spimem);
+
        /* For some (historical?) reason many platforms provide two different
         * names in flash_platform_data: "name" and "type". Quite often name is
         * set to "m25p80" and then "type" provides a real chip name.