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: 13124 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 58D9123FC1 for ; Fri, 23 Nov 2012 07:06:52 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 1D9ECA18AD0 for ; Fri, 23 Nov 2012 07:06:52 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so1454579ieb.11 for ; Thu, 22 Nov 2012 23:06:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=b76Bb/11e/UT+CEdW6N2odimcfCtqQdBcpODDqU2qIs=; b=aTabTiPauo6XFeB+nmU97jwELCPDrkms/cPcuDuYgoMBJBbRSOASVFI2vVTKAFqqZF 3plVc4oRbXqwr3aX8f7q2jjhewzcmu9wDDKqSvm7AyihYXtS+7fZhnKc2j7nfZ7dgqNA PW8aPi5GfQTBrlhANLZtWeHrNZiz47FGktYIM6CV82w15NUpocRXP6JNkHUV07diImAX lpRdazYNF6kJyn68FVuVcd2GA2hoADiIyVV5mBgIcokxyYDZwR5TSILscoa6JSoXIV0Z DWET+ncm8TWXKxxFv8tNtoA2VTIA4BBHJMfV/stu57paVHNXWD5tKOdnKhm7McQvHJqD Bxjw== Received: by 10.50.152.137 with SMTP id uy9mr2641725igb.62.1353654411845; Thu, 22 Nov 2012 23:06:51 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp312450igt; Thu, 22 Nov 2012 23:06:51 -0800 (PST) Received: by 10.66.77.39 with SMTP id p7mr8244267paw.8.1353654411241; Thu, 22 Nov 2012 23:06:51 -0800 (PST) Received: from mail-pa0-f46.google.com (mail-pa0-f46.google.com [209.85.220.46]) by mx.google.com with ESMTPS id q7si7169767paw.330.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.220.46 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=209.85.220.46; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.46 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) smtp.mail=tushar.behera@linaro.org Received: by mail-pa0-f46.google.com with SMTP id bh2so3346026pad.19 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: [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: ALoCoQkageDETIYObJXLb7vFcybjPxdz02p52F45BXhxSeMl41P4Iia5g1Vm08yTX7/M3RBGiYw8 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; }