From patchwork Mon Mar 9 22:10:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar X-Patchwork-Id: 28674 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1YV5tT-0006vJ-0G; Mon, 09 Mar 2015 23:11:23 +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.72/mailfrontend-6) with esmtp id 1YV5tQ-00026P-61; Mon, 09 Mar 2015 23:11:22 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932065AbbCIWLR (ORCPT + 1 other); Mon, 9 Mar 2015 18:11:17 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:35154 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753743AbbCIWLN (ORCPT ); Mon, 9 Mar 2015 18:11:13 -0400 Received: by wibbs8 with SMTP id bs8so25388301wib.0 for ; Mon, 09 Mar 2015 15:11:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mXJXMBmWbEE+U+LQsPK8A2HYe43XE+PclIYYTDYCI+4=; b=T2dhISIM5YuXSJpGffqftqZ7HNdj1zSnGE8W5hTFLfqALTHyijhTEaC6rALvh/Q4sq /cK6Wl6WOHUvDS/VgMsLBrCI3NOcGfngvvvCrms5js0cj0sKyIYrnEQIQvlMXZsUt1NO wkn6F9fTa4X4I5NVux3ZGSppHmsgNKUtcN2kY/BIH2Nvx8mo5n8VbZ5oojEsXPjhmEIQ dvzhCHsnKZHfbMT3vYhzDf0w0Jz7MUvb20D8ZbEKvc6PTdFqJQkFnHFyVfCRxFT08ens ucx7CMolFlX8rKqvn3AolN0twlSdy926icF0+6bG290ihbzP2nuLLBRSlV6fiPH8L5jo VNww== X-Received: by 10.194.237.34 with SMTP id uz2mr60846024wjc.157.1425939072474; Mon, 09 Mar 2015 15:11:12 -0700 (PDT) Received: from tango-charlie.lan ([91.84.71.54]) by mx.google.com with ESMTPSA id cf12sm30078236wjb.10.2015.03.09.15.11.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Mar 2015 15:11:11 -0700 (PDT) From: Lad Prabhakar To: LMML , Hans Verkuil Cc: "Lad, Prabhakar" Subject: [PATCH 2/2] media: sh_vou: use devres api Date: Mon, 9 Mar 2015 22:10:52 +0000 Message-Id: <1425939052-6375-3-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1425939052-6375-1-git-send-email-prabhakar.csengg@gmail.com> References: <1425939052-6375-1-git-send-email-prabhakar.csengg@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.3.9.215719 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_GMAIL 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __PHISH_SPEAR_STRUCTURE_1 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: "Lad, Prabhakar" use devres API while allocating resources so that these resources are released automatically on driver detach. Signed-off-by: Lad, Prabhakar --- drivers/media/platform/sh_vou.c | 51 +++++++++-------------------------------- 1 file changed, 11 insertions(+), 40 deletions(-) diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c index dde1ccc..1c52cd1 100644 --- a/drivers/media/platform/sh_vou.c +++ b/drivers/media/platform/sh_vou.c @@ -1297,7 +1297,7 @@ static int sh_vou_probe(struct platform_device *pdev) struct i2c_adapter *i2c_adap; struct video_device *vdev; struct sh_vou_device *vou_dev; - struct resource *reg_res, *region; + struct resource *reg_res; struct v4l2_subdev *subdev; int irq, ret; @@ -1309,7 +1309,7 @@ static int sh_vou_probe(struct platform_device *pdev) return -ENODEV; } - vou_dev = kzalloc(sizeof(*vou_dev), GFP_KERNEL); + vou_dev = devm_kzalloc(&pdev->dev, sizeof(*vou_dev), GFP_KERNEL); if (!vou_dev) return -ENOMEM; @@ -1337,28 +1337,18 @@ static int sh_vou_probe(struct platform_device *pdev) pix->sizeimage = VOU_MAX_IMAGE_WIDTH * 2 * 480; pix->colorspace = V4L2_COLORSPACE_SMPTE170M; - region = request_mem_region(reg_res->start, resource_size(reg_res), - pdev->name); - if (!region) { - dev_err(&pdev->dev, "VOU region already claimed\n"); - ret = -EBUSY; - goto ereqmemreg; - } - - vou_dev->base = ioremap(reg_res->start, resource_size(reg_res)); - if (!vou_dev->base) { - ret = -ENOMEM; - goto emap; - } + vou_dev->base = devm_ioremap_resource(&pdev->dev, reg_res); + if (IS_ERR(vou_dev->base)) + return PTR_ERR(vou_dev->base); - ret = request_irq(irq, sh_vou_isr, 0, "vou", vou_dev); - if (ret < 0) - goto ereqirq; + ret = devm_request_irq(&pdev->dev, irq, sh_vou_isr, 0, "vou", vou_dev); + if (ret) + return ret; ret = v4l2_device_register(&pdev->dev, &vou_dev->v4l2_dev); if (ret < 0) { dev_err(&pdev->dev, "Error registering v4l2 device\n"); - goto ev4l2devreg; + return ret; } vdev = &vou_dev->vdev; @@ -1382,7 +1372,7 @@ static int sh_vou_probe(struct platform_device *pdev) ret = sh_vou_hw_init(vou_dev); if (ret < 0) - goto ereset; + goto ei2cnd; subdev = v4l2_i2c_new_subdev_board(&vou_dev->v4l2_dev, i2c_adap, vou_pdata->board_info, NULL); @@ -1393,50 +1383,31 @@ static int sh_vou_probe(struct platform_device *pdev) ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1); if (ret < 0) - goto evregdev; + goto ei2cnd; return 0; -evregdev: ei2cnd: -ereset: i2c_put_adapter(i2c_adap); ei2cgadap: pm_runtime_disable(&pdev->dev); v4l2_device_unregister(&vou_dev->v4l2_dev); -ev4l2devreg: - free_irq(irq, vou_dev); -ereqirq: - iounmap(vou_dev->base); -emap: - release_mem_region(reg_res->start, resource_size(reg_res)); -ereqmemreg: - kfree(vou_dev); return ret; } static int sh_vou_remove(struct platform_device *pdev) { - int irq = platform_get_irq(pdev, 0); struct v4l2_device *v4l2_dev = platform_get_drvdata(pdev); struct sh_vou_device *vou_dev = container_of(v4l2_dev, struct sh_vou_device, v4l2_dev); struct v4l2_subdev *sd = list_entry(v4l2_dev->subdevs.next, struct v4l2_subdev, list); struct i2c_client *client = v4l2_get_subdevdata(sd); - struct resource *reg_res; - if (irq > 0) - free_irq(irq, vou_dev); pm_runtime_disable(&pdev->dev); video_unregister_device(&vou_dev->vdev); i2c_put_adapter(client->adapter); v4l2_device_unregister(&vou_dev->v4l2_dev); - iounmap(vou_dev->base); - reg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (reg_res) - release_mem_region(reg_res->start, resource_size(reg_res)); - kfree(vou_dev); return 0; }