From patchwork Thu Jul 26 06:23:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 13481 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SuHUt-000740-M9 for patchwork@linuxtv.org; Thu, 26 Jul 2012 08:24:31 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp for id 1SuHUs-0004AZ-FR; Thu, 26 Jul 2012 08:24:31 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751561Ab2GZGY2 (ORCPT ); Thu, 26 Jul 2012 02:24:28 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:33538 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751108Ab2GZGY1 (ORCPT ); Thu, 26 Jul 2012 02:24:27 -0400 Received: by pbbrp8 with SMTP id rp8so2709455pbb.19 for ; Wed, 25 Jul 2012 23:24:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=dzeqhG54inSmIOZx8e3F7WUNtVFhfSYZX2BWtYtBcuk=; b=bMRk3P3a3rwqrtoiosSlBZEXyBfkZzrmBQo5QcG2P9p8GRcdkIfmltthaA08HDwelQ tzM05LmaUqa04wlC4d1oA1il58u6zYV10+pApNwyKOzQWFn6c/ZVa9BL/KeGbtE3Lell /DVqjnO7t3umjuYy8hu21CiMOQzld9qYIhSnugZwvdPh3pLM7/V2/hiFKhzxjYNj4qcV vZxcUeypPGuU3Fk5FYqXRqHAyje4+khZJm2pdrzZ9rNso4ycziU9wvj5HTg/4dfFMr43 WjZzpQ1ECeClAKV3WXLvoqYP8qcQnPFLiP+f1f1zUkLTTdbT3+UpCuoy+Gl2cNwJGqRt kf5g== Received: by 10.68.224.225 with SMTP id rf1mr2550265pbc.55.1343283867299; Wed, 25 Jul 2012 23:24:27 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id pq5sm15903760pbb.30.2012.07.25.23.24.24 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 25 Jul 2012 23:24:26 -0700 (PDT) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: mchehab@infradead.org, s.nawrocki@samsung.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 1/2] [media] s5k6aa: Use devm_kzalloc function Date: Thu, 26 Jul 2012 11:53:32 +0530 Message-Id: <1343283813-24326-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQkVDsHJ2y1mq0ted/IlmaWAMtvinP6w2d2m895YkKkBlTuvBp479o1moOB2s6KtmxVBwZLq Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.7.26.61816 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1500_1599 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' devm_kzalloc() eliminates the need to free explicitly thereby making the code a bit simpler. Signed-off-by: Sachin Kamat Acked-by: Sylwester Nawrocki --- drivers/media/video/s5k6aa.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/media/video/s5k6aa.c b/drivers/media/video/s5k6aa.c index 6625e46..0c3bc58 100644 --- a/drivers/media/video/s5k6aa.c +++ b/drivers/media/video/s5k6aa.c @@ -1568,7 +1568,7 @@ static int s5k6aa_probe(struct i2c_client *client, return -EINVAL; } - s5k6aa = kzalloc(sizeof(*s5k6aa), GFP_KERNEL); + s5k6aa = devm_kzalloc(&client->dev, sizeof(*s5k6aa), GFP_KERNEL); if (!s5k6aa) return -ENOMEM; @@ -1592,7 +1592,7 @@ static int s5k6aa_probe(struct i2c_client *client, sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_SENSOR; ret = media_entity_init(&sd->entity, 1, &s5k6aa->pad, 0); if (ret) - goto out_err1; + return ret; ret = s5k6aa_configure_gpios(s5k6aa, pdata); if (ret) @@ -1627,8 +1627,6 @@ out_err3: s5k6aa_free_gpios(s5k6aa); out_err2: media_entity_cleanup(&s5k6aa->sd.entity); -out_err1: - kfree(s5k6aa); return ret; } @@ -1642,7 +1640,6 @@ static int s5k6aa_remove(struct i2c_client *client) media_entity_cleanup(&sd->entity); regulator_bulk_free(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); s5k6aa_free_gpios(s5k6aa); - kfree(s5k6aa); return 0; }