From patchwork Thu Sep 27 14:07:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 1514331 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 0623D40B2A for ; Thu, 27 Sep 2012 14:07:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751641Ab2I0OHn (ORCPT ); Thu, 27 Sep 2012 10:07:43 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:60623 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752635Ab2I0OHl (ORCPT ); Thu, 27 Sep 2012 10:07:41 -0400 Received: from axis700.grange (dslb-178-001-228-192.pools.arcor-ip.net [178.1.228.192]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MJYNz-1TKFp62Af5-0036qZ; Thu, 27 Sep 2012 16:07:36 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id BFF5B189B12; Thu, 27 Sep 2012 16:07:34 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1THEkY-0007SS-Ae; Thu, 27 Sep 2012 16:07:34 +0200 From: Guennadi Liakhovetski To: linux-media@vger.kernel.org Cc: devicetree-discuss@lists.ozlabs.org, Sylwester Nawrocki , Laurent Pinchart , Hans Verkuil , Magnus Damm , linux-sh@vger.kernel.org, Mark Brown , Stephen Warren , Arnd Bergmann , Grant Likely Subject: [PATCH 08/14] media: soc-camera: use managed devm_regulator_bulk_get() Date: Thu, 27 Sep 2012 16:07:27 +0200 Message-Id: <1348754853-28619-9-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1348754853-28619-1-git-send-email-g.liakhovetski@gmx.de> References: <1348754853-28619-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:cHhS10ItgoYfQGUkxhFWDGBGtJMEDc62E4KKjxucVYm 9DIEKA/R+m68/xcNvg6JpNAzsC7btb9itIGREHVR1QurgvTGOc mHGkvsPYB7rljdG68wyMEtAh1IK1da7CDatN/ZUNibwCe9LBT3 hEENRGDbyO11gpTeMr7RYHrUDeSQ9FWIN1eVbjARTyAgKfXQI3 uIF3dQrMpcgcj2Ui8DWmgiMESsHuZCBbUAMbC99Qt4asbVbGNg 6YyQ5OXgWpXgQmMgJqE6epyMxaidldsv2ypheaQMvheXqI7TZG WbVq04C7D93RW8ySlImN8AEUXLpfBtxsXcBQDv5RWxZ2wpfsN7 k4zAC0Q+26X6fQT45eLLIEgVtXgCn8lKskUDs3ynR/8nT3Oudv f65Tsvqcbqg9w== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Using device-managed devm_regulator_bulk_get() eliminates the need to release regulators explicitly. Signed-off-by: Guennadi Liakhovetski --- drivers/media/platform/soc_camera/soc_camera.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c index 997be15..c2a5fa3 100644 --- a/drivers/media/platform/soc_camera/soc_camera.c +++ b/drivers/media/platform/soc_camera/soc_camera.c @@ -1249,7 +1249,6 @@ static int soc_camera_i2c_notify(struct notifier_block *nb, video_device_release(icd->vdev); icd->vdev = NULL; } - regulator_bulk_free(icl->num_regulators, icl->regulators); v4l2_ctrl_handler_free(&icd->ctrl_handler); return NOTIFY_DONE; @@ -1358,8 +1357,8 @@ static int soc_camera_probe(struct soc_camera_device *icd) if (ret < 0) return ret; - ret = regulator_bulk_get(icd->pdev, icl->num_regulators, - icl->regulators); + ret = devm_regulator_bulk_get(icd->pdev, icl->num_regulators, + icl->regulators); if (ret < 0) goto ereg; @@ -1423,7 +1422,6 @@ eadddev: icd->vdev = NULL; } evdc: - regulator_bulk_free(icl->num_regulators, icl->regulators); ereg: v4l2_ctrl_handler_free(&icd->ctrl_handler); return ret; @@ -1460,8 +1458,6 @@ static int soc_camera_remove(struct soc_camera_device *icd) } soc_camera_free_user_formats(icd); - regulator_bulk_free(icl->num_regulators, icl->regulators); - return 0; }