All of lore.kernel.org
 help / color / mirror / Atom feed
From: Damien Cassou <damien.cassou@lifl.fr>
To: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: kernel-janitors@vger.kernel.org, linux-fbdev@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 2/5] drivers/video/bf54x-lq043fb.c: use devm_ functions
Date: Fri,  3 Aug 2012 17:40:12 +0200	[thread overview]
Message-ID: <1344008414-2894-4-git-send-email-damien.cassou@lifl.fr> (raw)
In-Reply-To: <1344008414-2894-1-git-send-email-damien.cassou@lifl.fr>

From: Damien Cassou <damien.cassou@lifl.fr>

The various devm_ functions allocate memory that is released when a driver
detaches. This patch replaces the use of kzalloc by devm_kzalloc.

Signed-off-by: Damien Cassou <damien.cassou@lifl.fr>

---
 drivers/video/bf54x-lq043fb.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c
index dc2f004..47702ee 100644
--- a/drivers/video/bf54x-lq043fb.c
+++ b/drivers/video/bf54x-lq043fb.c
@@ -601,7 +601,8 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)

 	fbinfo->fbops = &bfin_bf54x_fb_ops;

-	fbinfo->pseudo_palette = kzalloc(sizeof(u32) * 16, GFP_KERNEL);
+	fbinfo->pseudo_palette = devm_kzalloc(&pdev->dev, sizeof(u32) * 16,
+					      GFP_KERNEL);
 	if (!fbinfo->pseudo_palette) {
 		printk(KERN_ERR DRIVER_NAME
 		       "Fail to allocate pseudo_palette\n");
@@ -616,7 +617,7 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)
 		       "Fail to allocate colormap (%d entries)\n",
 		       BFIN_LCD_NBR_PALETTE_ENTRIES);
 		ret = -EFAULT;
-		goto out5;
+		goto out4;
 	}

 	if (request_ports(info)) {
@@ -671,8 +672,6 @@ out7:
 	free_ports(info);
 out6:
 	fb_dealloc_cmap(&fbinfo->cmap);
-out5:
-	kfree(fbinfo->pseudo_palette);
 out4:
 	dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
 			  info->dma_handle);
@@ -699,7 +698,6 @@ static int __devexit bfin_bf54x_remove(struct platform_device *pdev)
 		dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
 				  info->dma_handle);

-	kfree(fbinfo->pseudo_palette);
 	fb_dealloc_cmap(&fbinfo->cmap);

 #ifndef NO_BL_SUPPORT

WARNING: multiple messages have this Message-ID (diff)
From: Damien Cassou <damien.cassou@lifl.fr>
To: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: kernel-janitors@vger.kernel.org, linux-fbdev@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 2/5] drivers/video/bf54x-lq043fb.c: use devm_ functions
Date: Fri, 03 Aug 2012 15:40:12 +0000	[thread overview]
Message-ID: <1344008414-2894-4-git-send-email-damien.cassou@lifl.fr> (raw)
In-Reply-To: <1344008414-2894-1-git-send-email-damien.cassou@lifl.fr>

From: Damien Cassou <damien.cassou@lifl.fr>

The various devm_ functions allocate memory that is released when a driver
detaches. This patch replaces the use of kzalloc by devm_kzalloc.

Signed-off-by: Damien Cassou <damien.cassou@lifl.fr>

---
 drivers/video/bf54x-lq043fb.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c
index dc2f004..47702ee 100644
--- a/drivers/video/bf54x-lq043fb.c
+++ b/drivers/video/bf54x-lq043fb.c
@@ -601,7 +601,8 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)

 	fbinfo->fbops = &bfin_bf54x_fb_ops;

-	fbinfo->pseudo_palette = kzalloc(sizeof(u32) * 16, GFP_KERNEL);
+	fbinfo->pseudo_palette = devm_kzalloc(&pdev->dev, sizeof(u32) * 16,
+					      GFP_KERNEL);
 	if (!fbinfo->pseudo_palette) {
 		printk(KERN_ERR DRIVER_NAME
 		       "Fail to allocate pseudo_palette\n");
@@ -616,7 +617,7 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)
 		       "Fail to allocate colormap (%d entries)\n",
 		       BFIN_LCD_NBR_PALETTE_ENTRIES);
 		ret = -EFAULT;
-		goto out5;
+		goto out4;
 	}

 	if (request_ports(info)) {
@@ -671,8 +672,6 @@ out7:
 	free_ports(info);
 out6:
 	fb_dealloc_cmap(&fbinfo->cmap);
-out5:
-	kfree(fbinfo->pseudo_palette);
 out4:
 	dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
 			  info->dma_handle);
@@ -699,7 +698,6 @@ static int __devexit bfin_bf54x_remove(struct platform_device *pdev)
 		dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
 				  info->dma_handle);

-	kfree(fbinfo->pseudo_palette);
 	fb_dealloc_cmap(&fbinfo->cmap);

 #ifndef NO_BL_SUPPORT

  parent reply	other threads:[~2012-08-03 15:40 UTC|newest]

Thread overview: 88+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-03 15:40 [PATCH 0/5] use devm_ functions Damien Cassou
2012-08-03 15:40 ` Damien Cassou
2012-08-03 15:40 ` [PATCH 1/5] drivers/video/epson1355fb.c: " Damien Cassou
2012-08-03 15:40   ` Damien Cassou
2012-08-23 20:40   ` Florian Tobias Schandinat
2012-08-03 15:40 ` [PATCH 3/5] drivers/video/jz4740_fb.c: " Damien Cassou
2012-08-03 15:40   ` Damien Cassou
2012-08-23 20:41   ` Florian Tobias Schandinat
2012-09-02 15:19     ` Lars-Peter Clausen
2012-09-02 15:19       ` Lars-Peter Clausen
2012-08-03 15:40 ` Damien Cassou [this message]
2012-08-03 15:40   ` [PATCH 2/5] drivers/video/bf54x-lq043fb.c: " Damien Cassou
2012-08-23 20:41   ` Florian Tobias Schandinat
2012-08-03 15:40 ` [PATCH 5/5] drivers/video/msm/mddi_client_nt35399.c: " Damien Cassou
2012-08-03 15:40   ` Damien Cassou
2012-08-06  9:06   ` Dan Carpenter
2012-08-06  9:06     ` Dan Carpenter
2012-08-09 17:38   ` David Brown
2012-08-09 17:38     ` David Brown
2012-08-23 20:42   ` Florian Tobias Schandinat
2012-08-03 15:40 ` [PATCH 4/5] drivers/video/msm/mddi_client_dummy.c: " Damien Cassou
2012-08-03 15:40   ` Damien Cassou
2012-08-09 17:39   ` David Brown
2012-08-09 17:39     ` David Brown
2012-08-09 17:57   ` David Brown
2012-08-09 17:57     ` David Brown
2012-08-28  8:42     ` Damien Cassou
2012-08-28  8:42       ` Damien Cassou
  -- strict thread matches above, loose matches on Subject: below --
2012-07-31 16:39 [PATCH 0/5] " Damien Cassou
2012-07-31 16:39 ` Damien Cassou
2012-07-31 16:39 ` [PATCH 3/5] drivers/video/mbx/mbxfb.c: " Damien Cassou
2012-07-31 16:39   ` Damien Cassou
2012-08-23 20:37   ` Florian Tobias Schandinat
2012-07-31 16:39 ` [PATCH 2/5] drivers/video/gbefb.c: " Damien Cassou
2012-07-31 16:39   ` Damien Cassou
2012-08-23 20:37   ` Florian Tobias Schandinat
2012-09-13 19:06     ` Geert Uytterhoeven
2012-09-13 19:06       ` Geert Uytterhoeven
2012-09-20 21:58       ` Florian Tobias Schandinat
2012-10-11  0:38         ` [PATCH] gbefb: fix compile error Florian Tobias Schandinat
2012-07-31 16:39 ` [PATCH 1/5] drivers/video/fsl-diu-fb.c: use devm_ functions Damien Cassou
2012-07-31 16:39   ` Damien Cassou
2012-08-23 20:38   ` Florian Tobias Schandinat
2012-07-31 16:39 ` [PATCH 4/5] drivers/video/exynos/exynos_mipi_dsi.c: " Damien Cassou
2012-07-31 16:39   ` Damien Cassou
2012-07-31 16:39 ` [PATCH 5/5] drivers/video/exynos/exynos_dp_core.c: " Damien Cassou
2012-07-31 16:39   ` Damien Cassou
2012-07-31 23:21   ` Jingoo Han
2012-07-31 23:21     ` Jingoo Han
2012-08-01  3:59     ` Sachin Kamat
2012-08-01  4:11       ` Sachin Kamat
2012-08-01  4:30       ` Jingoo Han
2012-08-01  4:30         ` Jingoo Han
2012-08-01  4:38         ` Sachin Kamat
2012-08-01  4:50           ` Sachin Kamat
2012-08-01  4:57           ` Jingoo Han
2012-08-01  4:57             ` Jingoo Han
2012-08-01  5:13             ` Julia Lawall
2012-08-01  5:13               ` Julia Lawall
2012-08-01  5:08       ` Jingoo Han
2012-08-01  5:08         ` Jingoo Han
2012-08-01 16:36         ` Damien Cassou
2012-08-01 16:36           ` Damien Cassou
2012-07-31 13:54 [PATCH 0/5] " Damien Cassou
2012-07-31 13:54 ` Damien Cassou
2012-07-31 13:54 ` [PATCH 5/5] drivers/video/ep93xx-fb.c: " Damien Cassou
2012-07-31 13:54   ` Damien Cassou
2012-08-23 20:35   ` Florian Tobias Schandinat
2012-08-23 20:35     ` Florian Tobias Schandinat
2012-07-31 13:54 ` [PATCH 4/5] drivers/video/da8xx-fb.c: " Damien Cassou
2012-07-31 13:54   ` Damien Cassou
2012-07-31 15:47   ` Sachin Kamat
2012-07-31 15:59     ` Sachin Kamat
2012-07-31 16:01     ` Damien Cassou
2012-07-31 16:01       ` Damien Cassou
2012-07-31 13:54 ` [PATCH 3/5] drivers/video/cobalt_lcdfb.c: " Damien Cassou
2012-07-31 13:54   ` Damien Cassou
2012-08-23 20:36   ` Florian Tobias Schandinat
2012-07-31 13:54 ` [PATCH 2/5] drivers/video/bfin-t350mcqb-fb.c: " Damien Cassou
2012-07-31 13:54   ` Damien Cassou
2012-07-31 13:57   ` Mike Frysinger
2012-07-31 13:57     ` Mike Frysinger
2012-07-31 16:18     ` Damien Cassou
2012-07-31 16:18       ` Damien Cassou
2012-07-31 13:54 ` [PATCH 1/5] drivers/video/bf537-lq035.c: " Damien Cassou
2012-07-31 13:54   ` Damien Cassou
2012-08-23 20:36   ` Florian Tobias Schandinat
2012-08-23 20:36     ` Florian Tobias Schandinat

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1344008414-2894-4-git-send-email-damien.cassou@lifl.fr \
    --to=damien.cassou@lifl.fr \
    --cc=FlorianSchandinat@gmx.de \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.