From patchwork Fri Nov 23 07:00:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 201246 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-yh0-f56.google.com (mail-yh0-f56.google.com [209.85.213.56]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 84C982C008A for ; Fri, 23 Nov 2012 18:06:54 +1100 (EST) Received: by mail-yh0-f56.google.com with SMTP id j63sf3889030yhj.11 for ; Thu, 22 Nov 2012 23:06:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:x-beenthere:received-spf:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-google-group-id:list-post:list-help:list-archive:sender :list-subscribe:list-unsubscribe:content-type; bh=SciEF/A7Istas9UAqpGuyqxK5bokWE/rk4U2wHY5pwE=; b=L9BcHHhJIK5mYSbTjRt/Xq768lm9exuGdUZKi6ykbMPp34BTYW6RHPbJAFDmLTRDqR ZwlnlHsz/xmRlECusnOtkjEhw8hopbAgj8GaqoAhrswJaM740MsBZzfNZM68oxWs6EbS Eig2f3qMrxyVb8J95KzDDCw8pTFKXL8SzwBAz7pZJILuHMy3lxYVJ2/ako22EdxGrBI+ +rTQgenGE5h4JpN7z0tPOBd6rwN36zM97/VzZrTLv99AdOCCXeL9Jz04gwU1ZInVkzqB yn5uRD7dLLeMREXLfdRQFRF9Q18FjWBXxTU8FQpG3JXMpFpkfTtmaQ9gdbO3zOj/uwdg 4zJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:received-spf:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:x-gm-message-state :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:x-google-group-id:list-post :list-help:list-archive:sender:list-subscribe:list-unsubscribe :content-type; bh=SciEF/A7Istas9UAqpGuyqxK5bokWE/rk4U2wHY5pwE=; b=MGpF+VEUqafhQ5MgTJ5do+JSFRBtYk5/aSdB8M7kLpu+asgV3Lmi6cSQU80K+gyOBv 4IoVxQW89GQy6yXuJIP2AIL+433gYwrVx/eKWF+tMAx4bxVQHb6J4FKIv4O0mjLM9Ibp x6LsrvrSzQYibEhecBmuA3qDp+UwfOt0roV3sQp9j9j9i0ww4aX+xk+wttEIiDPBNLwf QEstuudAZ0NrRGo2nNJTHjMtIciLqS6ZcyL5587XM0UHBjLtv/e9yrr95wJYYnArPN2g oqPouMAWEakI3W8/oS17ciu492YHpxPxd0tlzjqztAAyG0HbN9O4IXu2lDooRFiKcwXJ X0kQ== Received: by 10.50.11.196 with SMTP id s4mr763805igb.9.1353654411516; Thu, 22 Nov 2012 23:06:51 -0800 (PST) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.41.137 with SMTP id f9ls432632igl.44.canary; Thu, 22 Nov 2012 23:06:51 -0800 (PST) Received: by 10.66.83.5 with SMTP id m5mr620013pay.33.1353654411186; Thu, 22 Nov 2012 23:06:51 -0800 (PST) Received: by 10.66.83.5 with SMTP id m5mr620012pay.33.1353654411176; Thu, 22 Nov 2012 23:06:51 -0800 (PST) Received: from mail-pb0-f54.google.com (mail-pb0-f54.google.com [209.85.160.54]) by gmr-mx.google.com with ESMTPS id yl8si1119581pbc.1.2012.11.22.23.06.51 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 23:06:51 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.54 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=209.85.160.54; Received: by mail-pb0-f54.google.com with SMTP id wz12so7893820pbc.27 for ; Thu, 22 Nov 2012 23:06:51 -0800 (PST) Received: by 10.66.81.97 with SMTP id z1mr8188878pax.19.1353654411008; Thu, 22 Nov 2012 23:06:51 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id nm9sm3349142pbc.46.2012.11.22.23.06.40 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 23:06:50 -0800 (PST) From: Tushar Behera To: linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com Cc: a.zummo@towertech.it, patches@linaro.org Subject: [rtc-linux] [PATCH 2/2] drivers/rtc/rtc-s3c.c: Convert to use devm_* API Date: Fri, 23 Nov 2012 12:30:19 +0530 Message-Id: <1353654019-1099-3-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1353654019-1099-1-git-send-email-tushar.behera@linaro.org> References: <1353654019-1099-1-git-send-email-tushar.behera@linaro.org> X-Gm-Message-State: ALoCoQmdRvseFxa6Q9Evtglgs0SMc/rB87PL9zLHFGNuTUhd+SVRm13OBJ9DCwjneeLefpYsE/Oz X-Original-Sender: tushar.behera@linaro.org X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 209.85.160.54 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) smtp.mail=tushar.behera@linaro.org Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , rtc-s3c driver is modified to use devm_request_and_ioremap() (combining request_mem_region and ioremap), devm_clk_get() and devm_request_irq() APIs. Since this removes the necessity of freeing the related resources the return path is also simplified. Signed-off-by: Tushar Behera --- drivers/rtc/rtc-s3c.c | 45 ++++++++------------------------------------- 1 files changed, 8 insertions(+), 37 deletions(-) diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index df7b478..b74720f 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c @@ -47,8 +47,6 @@ struct s3c_rtc_drv_data { /* I have yet to find an S3C implementation with more than one * of these rtc blocks in */ -static struct resource *s3c_rtc_mem; - static struct clk *rtc_clk; static void __iomem *s3c_rtc_base; static int s3c_rtc_alarmno = NO_IRQ; @@ -427,21 +425,13 @@ static int __devexit s3c_rtc_remove(struct platform_device *dev) { struct rtc_device *rtc = platform_get_drvdata(dev); - free_irq(s3c_rtc_alarmno, rtc); - free_irq(s3c_rtc_tickno, rtc); - platform_set_drvdata(dev, NULL); rtc_device_unregister(rtc); s3c_rtc_setaie(&dev->dev, 0); - clk_put(rtc_clk); rtc_clk = NULL; - iounmap(s3c_rtc_base); - release_resource(s3c_rtc_mem); - kfree(s3c_rtc_mem); - return 0; } @@ -496,27 +486,18 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) return -ENOENT; } - s3c_rtc_mem = request_mem_region(res->start, resource_size(res), - pdev->name); - - if (s3c_rtc_mem == NULL) { - dev_err(&pdev->dev, "failed to reserve memory region\n"); - return -ENOENT; - } - - s3c_rtc_base = ioremap(res->start, resource_size(res)); + s3c_rtc_base = devm_request_and_ioremap(&pdev->dev, res); if (s3c_rtc_base == NULL) { - dev_err(&pdev->dev, "failed ioremap()\n"); - ret = -EINVAL; - goto err_nomap; + dev_err(&pdev->dev, "failed to ioremap memory region\n"); + return -EINVAL; } - rtc_clk = clk_get(&pdev->dev, "rtc"); + rtc_clk = devm_clk_get(&pdev->dev, "rtc"); if (IS_ERR(rtc_clk)) { dev_err(&pdev->dev, "failed to find rtc clock source\n"); ret = PTR_ERR(rtc_clk); rtc_clk = NULL; - goto err_clk; + return ret; } clk_enable(rtc_clk); @@ -575,28 +556,24 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) s3c_rtc_setfreq(&pdev->dev, 1); - ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq, + ret = devm_request_irq(&pdev->dev, s3c_rtc_alarmno, s3c_rtc_alarmirq, 0, "s3c2410-rtc alarm", rtc); if (ret) { dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret); goto err_alarm_irq; } - ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq, + ret = devm_request_irq(&pdev->dev, s3c_rtc_tickno, s3c_rtc_tickirq, 0, "s3c2410-rtc tick", rtc); if (ret) { dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret); - free_irq(s3c_rtc_alarmno, rtc); - goto err_tick_irq; + goto err_alarm_irq; } clk_disable(rtc_clk); return 0; - err_tick_irq: - free_irq(s3c_rtc_alarmno, rtc); - err_alarm_irq: platform_set_drvdata(pdev, NULL); rtc_device_unregister(rtc); @@ -604,13 +581,7 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) err_nortc: s3c_rtc_enable(pdev, 0); clk_disable(rtc_clk); - clk_put(rtc_clk); - - err_clk: - iounmap(s3c_rtc_base); - err_nomap: - release_resource(s3c_rtc_mem); return ret; }