Linux Framebuffer Layer development
 help / color / mirror / Atom feed
From: Archit Taneja <archit@ti.com>
To: tomi.valkeinen@ti.com
Cc: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org,
	Archit Taneja <archit@ti.com>
Subject: [PATCH 08/11] OMAPDSS: picodlp: use devm_kzalloc for allocating driver data
Date: Wed, 13 Feb 2013 14:19:11 +0000	[thread overview]
Message-ID: <1360764434-18788-9-git-send-email-archit@ti.com> (raw)
In-Reply-To: <1360764434-18788-1-git-send-email-archit@ti.com>

Use devm_kzalloc instead of kzalloc to allocate driver data for the picodlp
panel driver. This simplifies the driver's probe and remove functions.

Signed-off-by: Archit Taneja <archit@ti.com>
---
 drivers/video/omap2/displays/panel-picodlp.c |   16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/video/omap2/displays/panel-picodlp.c b/drivers/video/omap2/displays/panel-picodlp.c
index 1b94018..3864299 100644
--- a/drivers/video/omap2/displays/panel-picodlp.c
+++ b/drivers/video/omap2/displays/panel-picodlp.c
@@ -423,11 +423,11 @@ static int picodlp_panel_probe(struct omap_dss_device *dssdev)
 	struct picodlp_panel_data *picodlp_pdata = get_panel_data(dssdev);
 	struct i2c_adapter *adapter;
 	struct i2c_client *picodlp_i2c_client;
-	int r = 0, picodlp_adapter_id;
+	int picodlp_adapter_id;
 
 	dssdev->panel.timings = pico_ls_timings;
 
-	picod =  kzalloc(sizeof(struct picodlp_data), GFP_KERNEL);
+	picod = devm_kzalloc(&dssdev->dev, sizeof(*picod), GFP_KERNEL);
 	if (!picod)
 		return -ENOMEM;
 
@@ -438,25 +438,21 @@ static int picodlp_panel_probe(struct omap_dss_device *dssdev)
 	adapter = i2c_get_adapter(picodlp_adapter_id);
 	if (!adapter) {
 		dev_err(&dssdev->dev, "can't get i2c adapter\n");
-		r = -ENODEV;
-		goto err;
+		return -ENODEV;
 	}
 
 	picodlp_i2c_client = i2c_new_device(adapter, &picodlp_i2c_board_info);
 	if (!picodlp_i2c_client) {
 		dev_err(&dssdev->dev, "can't add i2c device::"
 					 " picodlp_i2c_client is NULL\n");
-		r = -ENODEV;
-		goto err;
+		return -ENODEV;
 	}
 
 	picod->picodlp_i2c_client = picodlp_i2c_client;
 
 	dev_set_drvdata(&dssdev->dev, picod);
-	return r;
-err:
-	kfree(picod);
-	return r;
+
+	return 0;
 }
 
 static void picodlp_panel_remove(struct omap_dss_device *dssdev)
-- 
1.7.9.5


  parent reply	other threads:[~2013-02-13 14:19 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-13 14:19 [PATCH 00/11] OMAPDSS: Misc cleanups Archit Taneja
2013-02-13 14:19 ` [PATCH 01/11] OMAPDSS: acx565akm: remove platform backlight calls Archit Taneja
2013-02-13 14:19 ` [PATCH 02/11] OMAPDSS: ls037v7dw01: " Archit Taneja
2013-02-13 14:19 ` [PATCH 03/11] OMAPDSS: ZOOM/NEC-nl8048hl11: remove platform backlight support Archit Taneja
2013-02-13 14:19 ` [PATCH 04/11] OMAPDSS: n8x0: remove platform backlight calls Archit Taneja
2013-02-13 14:19 ` [PATCH 05/11] OMAPDSS: remove set_backlight/get_backlight function ptrs Archit Taneja
2013-02-13 14:19 ` [PATCH 06/11] OMAPDSS: Generic DPI Panel: use devm_kzalloc for allocating driver data Archit Taneja
2013-02-13 14:19 ` [PATCH 07/11] OMAPDSS: lb035q02: " Archit Taneja
2013-02-13 14:19 ` Archit Taneja [this message]
2013-02-13 14:19 ` [PATCH 09/11] OMAPDSS: remove unnecessary DSI external TE pin platform info from omap_dss_device Archit Taneja
2013-02-13 14:19 ` [PATCH 10/11] OMAPDSS: panel acx565akm: remove omap_dss_device maximum backlight level usage Archit Taneja
2013-02-13 14:19 ` [PATCH 11/11] OMAPDSS: Remove max_backlight_level form omap_dss_device Archit Taneja

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=1360764434-18788-9-git-send-email-archit@ti.com \
    --to=archit@ti.com \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=tomi.valkeinen@ti.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox