Patchwork [v2] M25p80 little bugs

login
register
mail settings
Submitter 王宇航
Date July 12, 2013, 6:33 a.m.
Message ID <1373610834-5240-1-git-send-email-wangyuhang2014@gmail.com>
Download mbox | patch
Permalink /patch/258695/
State New
Headers show

Comments

王宇航 - July 12, 2013, 6:33 a.m.
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 <wangyuhang2014@gmail.com>
---
 drivers/mtd/devices/m25p80.c |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
Marek Vasut - July 12, 2013, 11:49 a.m.
Dear wangyuhang,

> 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.

Now just fix the commit message and you're done, thanks! ;-)

> Signed-off-by: wangyuhang <wangyuhang2014@gmail.com>
> ---
>  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 {

Best regards,
Marek Vasut

Patch

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 {