From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from va3outboundpool.messaging.microsoft.com (va3ehsobe002.messaging.microsoft.com [216.32.180.12]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6913D2C0091 for ; Sun, 26 Jan 2014 18:48:23 +1100 (EST) From: Hou Zhiqiang To: , Subject: [PATCH v2] mtd: m25p80: Make the name of mtd_info fixed Date: Sun, 26 Jan 2014 14:16:43 +0800 Message-ID: <1390717003-28699-1-git-send-email-b48286@freescale.com> MIME-Version: 1.0 Content-Type: text/plain Cc: scottwood@freescale.com, Hou Zhiqiang , mingkai.hu@freescale.com, computersforpeace@gmail.com List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To give spi flash layout using "mtdparts=..." in cmdline, we must give mtd_info a fixed name,because the cmdlinepart's parser will match the name given in cmdline with the mtd_info. Now, if use OF node, mtd_info's name will be spi->dev->name. It consists of spi_master->bus_num, and the spi_master->bus_num maybe dynamically fetched. So, give the mtd_info a new fiexd name "name.cs", "name" is name of spi_device_id and "cs" is chip-select in spi_dev. Signed-off-by: Hou Zhiqiang --- v2: - add check for return value of function kasprintf. - whether the spi_master->bus_num is dynamical is determined by spi controller driver, and it can't be check in this driver. So, we can not initial the mtd_info's name by distinguishing the spi_master bus_num dynamically-allocated or not. drivers/mtd/devices/m25p80.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index eb558e8..1f494d2 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -1011,8 +1011,12 @@ static int m25p_probe(struct spi_device *spi) if (data && data->name) flash->mtd.name = data->name; - else - flash->mtd.name = dev_name(&spi->dev); + else { + flash->mtd.name = kasprintf(GFP_KERNEL, "%s.%d", + id->name, spi->chip_select); + if (!flash->mtd.name) + return -ENOMEM; + } flash->mtd.type = MTD_NORFLASH; flash->mtd.writesize = 1; -- 1.8.4.1