From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UxWx3-0001JP-N7 for linux-mtd@lists.infradead.org; Fri, 12 Jul 2013 06:35:34 +0000 Received: by mail-pa0-f43.google.com with SMTP id hz11so8614998pad.30 for ; Thu, 11 Jul 2013 23:35:08 -0700 (PDT) From: wangyuhang To: marex@denx.de Subject: [PATCH v2] M25p80 little bugs Date: Fri, 12 Jul 2013 14:33:54 +0800 Message-Id: <1373610834-5240-1-git-send-email-wangyuhang2014@gmail.com> In-Reply-To: References: Cc: artem.bityutskiy@linux.intel.com, wfp5p@virginia.edu, swarren@nvidia.com, wangyuhang , linux-mtd@lists.infradead.org List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Hi, Marek Really sorry for the previous deformed patch. And you are right, using devm_kzalloc looks better. I have resended the patch, please help me review. Thanks. Signed-off-by: wangyuhang --- drivers/mtd/devices/m25p80.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 5b6b072..70f3c54 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -955,15 +955,9 @@ static int m25p_probe(struct spi_device *spi) } } - flash = kzalloc(sizeof *flash, GFP_KERNEL); + flash = devm_kzalloc(&spi->dev, sizeof *flash, GFP_KERNEL); if (!flash) return -ENOMEM; - flash->command = kmalloc(MAX_CMD_SIZE + (flash->fast_read ? 1 : 0), - GFP_KERNEL); - if (!flash->command) { - kfree(flash); - return -ENOMEM; - } flash->spi = spi; mutex_init(&flash->lock); @@ -1032,6 +1026,11 @@ static int m25p_probe(struct spi_device *spi) flash->fast_read = true; #endif + flash->command = devm_kzalloc(&spi->dev, + MAX_CMD_SIZE + (flash->fast_read ? 1 : 0), GFP_KERNEL); + if (!flash->command) + return -ENOMEM; + if (info->addr_width) flash->addr_width = info->addr_width; else { -- 1.7.9.5