From patchwork Tue Jan 8 06:48:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 16179 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TsT75-0007Yf-Am; Tue, 08 Jan 2013 07:56:43 +0100 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-2) with esmtp id 1TsT74-000134-IB; Tue, 08 Jan 2013 07:56:43 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753609Ab3AHG4k (ORCPT + 1 other); Tue, 8 Jan 2013 01:56:40 -0500 Received: from mail-da0-f46.google.com ([209.85.210.46]:60969 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751586Ab3AHG4k (ORCPT ); Tue, 8 Jan 2013 01:56:40 -0500 Received: by mail-da0-f46.google.com with SMTP id p5so46278dak.5 for ; Mon, 07 Jan 2013 22:56:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=qG+F4fGoW7bIgP7Z9oE9b+AN8PmL6WxCM66o2t5+A2w=; b=C4rDsrmml9y/AE4G1ftAGMUbmfm2ixEancZ0IjfG1DkVHPGh3mHG1Cdk/DBDdMRc8+ qW4eFIPg7+7mkTqJxa6z1eEQpElHP6YfQWxvDmqEvhCQH1uKdEwmZ547CT36DzeFiKvc xEJnIH/jE7dsoMm7Soo6IfORBk+zs3qqPbXx6IxLQtVDqqTMdxy38XyTehekXCyMduNM d/ds+5aLdvEBrKUlJJT5egKfRpgaMgHjtrg/7r3oxdQLDUAlziVRaIPn8QFqpQJ0fY0K fqzgSPa0w184Sa6ioXdYiKZGHU2RR6oCCn1TOd/IhiJoG8NqPRI0u3RjUfMq3ja2a1vD norA== X-Received: by 10.69.0.74 with SMTP id aw10mr194833375pbd.87.1357628199554; Mon, 07 Jan 2013 22:56:39 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id oi2sm39088824pbb.62.2013.01.07.22.56.36 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 07 Jan 2013 22:56:38 -0800 (PST) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: s.nawrocki@samsung.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 1/1] [media] s5k6aa: Use devm_regulator_bulk_get API Date: Tue, 8 Jan 2013 12:18:24 +0530 Message-Id: <1357627704-14269-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQnIUwNtjOMQ68gDeJ+fBQEYESy6YRs1D+cd0cekYspcD61erd0Yi+0mOZrKIuLu5ZaczGkF 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: 2013.1.8.64518 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_1700_1799 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_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 , __YOUTUBE_RCVD 0' devm_regulator_bulk_get is device managed and saves some cleanup and exit code. Signed-off-by: Sachin Kamat --- drivers/media/i2c/s5k6aa.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/media/i2c/s5k6aa.c b/drivers/media/i2c/s5k6aa.c index 57cd4fa..bdf5e3d 100644 --- a/drivers/media/i2c/s5k6aa.c +++ b/drivers/media/i2c/s5k6aa.c @@ -1598,7 +1598,7 @@ static int s5k6aa_probe(struct i2c_client *client, for (i = 0; i < S5K6AA_NUM_SUPPLIES; i++) s5k6aa->supplies[i].supply = s5k6aa_supply_names[i]; - ret = regulator_bulk_get(&client->dev, S5K6AA_NUM_SUPPLIES, + ret = devm_regulator_bulk_get(&client->dev, S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); if (ret) { dev_err(&client->dev, "Failed to get regulators\n"); @@ -1607,7 +1607,7 @@ static int s5k6aa_probe(struct i2c_client *client, ret = s5k6aa_initialize_ctrls(s5k6aa); if (ret) - goto out_err4; + goto out_err3; s5k6aa_presets_data_init(s5k6aa); @@ -1618,8 +1618,6 @@ static int s5k6aa_probe(struct i2c_client *client, return 0; -out_err4: - regulator_bulk_free(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); out_err3: s5k6aa_free_gpios(s5k6aa); out_err2: @@ -1635,7 +1633,6 @@ static int s5k6aa_remove(struct i2c_client *client) v4l2_device_unregister_subdev(sd); v4l2_ctrl_handler_free(sd->ctrl_handler); media_entity_cleanup(&sd->entity); - regulator_bulk_free(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); s5k6aa_free_gpios(s5k6aa); return 0;