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. Signed-off-by: Frieder Schrempf <frieder.schrempf@xxxxxxxxx> --- drivers/mtd/devices/m25p80.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index e84563d..482f0ef 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -199,8 +199,7 @@ static int m25p_probe(struct spi_mem *spimem) hwcaps.mask |= SNOR_HWCAPS_READ_1_2_2; } - if (data && data->name) - nor->mtd.name = data->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 -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html