From patchwork Mon Apr 1 09:42:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 232692 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-ie0-x23b.google.com (mail-ie0-x23b.google.com [IPv6:2607:f8b0:4001:c03::23b]) (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 D9DE62C0109 for ; Mon, 1 Apr 2013 20:42:41 +1100 (EST) Received: by mail-ie0-f187.google.com with SMTP id k11sf911675iea.4 for ; Mon, 01 Apr 2013 02:42:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=x-received:x-beenthere:x-received:received-spf:x-auditid:from:to:cc :references:in-reply-to:subject:date:message-id:mime-version :x-mailer:thread-index:x-brightmail-tracker:x-brightmail-tracker :dlp-filter:x-mtr:x-cfilter-loop: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:content-language; bh=0D0Bmw5SMgWoeAKgweXPCHoHekWp/OTHVswu82GcPNQ=; b=KNP946O4d2Xn7AAhdwOXV0xeU792ipONFQ77btb5iLPpe/tsfFBDhNkjiBHVRw88mC DBuAgmduJF3OrZ3uhsIMzLyMdyCpfRjmgVxtqNYpphXpYnziYnujzaHuYrAJ+RaFm61p YFOfiZp3Xk3cErHeJRXqLSgUrF0Dvr9t3l7jkAZYvNx96jmSc2ycNahTKn7CKx738EN5 6Fvljns+NciUKZXEjIYk+Xi6NrqWCbjboJ4jSDx7i8uF2fuE0Kbsu+Po9xhvT/nRGxVn qw2YSBXbCBMcjlxIu/FA0Rmzi/WPCTlr3qr6Wmtbw2KIK9BeFZhoPNHwLtrzJVQEGSMK pUBA== X-Received: by 10.50.130.9 with SMTP id oa9mr792970igb.3.1364809358144; Mon, 01 Apr 2013 02:42:38 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.89.163 with SMTP id bp3ls888911igb.25.canary; Mon, 01 Apr 2013 02:42:37 -0700 (PDT) X-Received: by 10.66.225.230 with SMTP id rn6mr2325914pac.26.1364809357924; Mon, 01 Apr 2013 02:42:37 -0700 (PDT) Received: from mailout2.samsung.com (mailout2.samsung.com. [203.254.224.25]) by gmr-mx.google.com with ESMTP id ty9si2152802pbc.0.2013.04.01.02.42.37; Mon, 01 Apr 2013 02:42:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of jg1.han@samsung.com designates 203.254.224.25 as permitted sender) client-ip=203.254.224.25; Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MKK0082TLN0GS10@mailout2.samsung.com> for rtc-linux@googlegroups.com; Mon, 01 Apr 2013 18:42:36 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.50]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 60.A1.20872.C8659515; Mon, 01 Apr 2013 18:42:36 +0900 (KST) X-AuditID: cbfee68d-b7f786d000005188-c8-5159568cb12e Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 9D.F2.17838.C8659515; Mon, 01 Apr 2013 18:42:36 +0900 (KST) Received: from DOJG1HAN02 ([12.23.120.99]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MKK00BC3LN02240@mmp1.samsung.com>; Mon, 01 Apr 2013 18:42:36 +0900 (KST) From: Jingoo Han To: 'Andrew Morton' Cc: linux-kernel@vger.kernel.org, 'Alessandro Zummo' , rtc-linux@googlegroups.com, 'Jingoo Han' References: <000c01ce2ebd$2a1307f0$7e3917d0$%han@samsung.com> In-reply-to: <000c01ce2ebd$2a1307f0$7e3917d0$%han@samsung.com> Subject: [rtc-linux] [PATCH 02/27] rtc: rtc-at91sam9: use devm_*() functions Date: Mon, 01 Apr 2013 18:42:36 +0900 Message-id: <000d01ce2ebd$3e0bcb20$ba236160$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac4uvSmu8Ej3RSKpRZmzfFm2iz9KEwAAAc6w X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKIsWRmVeSWpSXmKPExsVy+t8zI92esMhAg+4llhZLLl5lt5izfg2b xeWFl1gtLu+aw2axv7OD0YHVY8/Ek2weJ2b8ZvHo27KK0WP6vJ9MHp83yQWwRnHZpKTmZJal FunbJXBlbHz1ibWgSbLiy9YL7A2MO0W6GDk4JARMJK5P1uli5AQyxSQu3FvP1sXIxSEksIxR omVbHxNEwkRi5p+FLBCJRYwS/zafZYRwfjFK9JzqYgGpYhNQk/jy5TA7yFQRAX2JthYNkBpm gV5GiTO9u9lBaoQEbCV+nP3ODGJzCthJvFk4jxGkXljAQeLXsmyQMIuAqsT8WefBynmByk+v vsAMYQtK/Jh8D2wVs4CWxPqdx5kgbHmJzWveMkM8oy7x6K8uSFhEwEjixMY5bBAlIhL7Xrxj hPjlEbvEw1+aEKsEJL5NPsQC0SorsekAM0SJpMTBFTdYJjBKzEKyeBaSxbOQLJ6FZMMCRpZV jKKpBckFxUnpRYZ6xYm5xaV56XrJ+bmbGCFR2ruD8fYB60OMyUDrJzJLiSbnA6M8ryTe0NjM yMLUxNTYyNzSjDRhJXFetRbrQCGB9MSS1OzU1ILUovii0pzU4kOMTBycUg2MQQquBjYaG+O7 uk/ethEQf5ncsexN0c9LaTYi0XEceZGbhdRedQYsjPyR/m/PJWmRyY7zC5R88tRz1A9Z6mxf O3WfxmTLMxGfrX2KXNTKns/SLlQwf72kMnDHalbHprQF6/+GtE7WvzZxjpd2yf9jJyYdKM/0 MAnqae/UlnyTxnD6yem9/GuVWIozEg21mIuKEwHeW5X/6AIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCKsWRmVeSWpSXmKPExsVy+t9jAd2esMhAgx0XTSyWXLzKbjFn/Ro2 i8sLL7FaXN41h81if2cHowOrx56JJ9k8Tsz4zeLRt2UVo8f0eT+ZPD5vkgtgjWpgtMlITUxJ LVJIzUvOT8nMS7dV8g6Od443NTMw1DW0tDBXUshLzE21VXLxCdB1y8wB2q6kUJaYUwoUCkgs LlbSt8M0ITTETdcCpjFC1zckCK7HyAANJKxjzNj46hNrQZNkxZetF9gbGHeKdDFyckgImEjM /LOQBcIWk7hwbz1bFyMXh5DAIkaJf5vPMkI4vxglek51gVWxCahJfPlymL2LkYNDREBfoq1F A6SGWaCXUeJM7252kBohAVuJH2e/M4PYnAJ2Em8WzmMEqRcWcJD4tSwbJMwioCoxf9Z5sHJe oPLTqy8wQ9iCEj8m3wNbxSygJbF+53EmCFteYvOat8wgYyQE1CUe/dUFCYsIGEmc2DiHDaJE RGLfi3eMExiFZiGZNAvJpFlIJs1C0rKAkWUVo2hqQXJBcVJ6rqFecWJucWleul5yfu4mRnAa eCa1g3Flg8UhRgEORiUe3ogLEYFCrIllxZW5hxglOJiVRHh9vgGFeFMSK6tSi/Lji0pzUosP MSYDPTqRWUo0OR+YovJK4g2NTcyMLI3MLIxMzM1JE1YS5z3Qah0oJJCeWJKanZpakFoEs4WJ g1OqgbHFlr163Z4JQkK/9X8urt//cdp8qYxd4l993yw1PHr3sO6h99s9Uqexrm8VOPdR4rgW e/BtA88359n/P4q252vS+SB+57ryqtnZG1/FpVcvWnrq5s1pzq+XM9vF/JcXEYj0msLEnd26 /lJhtn26f36JhPbsqwHPejR+F6+tzvhYs8o9+XD41V9KLMUZiYZazEXFiQADgGRpRwMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-Original-Sender: jg1.han@samsung.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of jg1.han@samsung.com designates 203.254.224.25 as permitted sender) smtp.mail=jg1.han@samsung.com 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: , Content-type: text/plain; charset=ISO-8859-1 Content-language: ko Use devm_*() functions to make cleanup paths simpler. Signed-off-by: Jingoo Han --- drivers/rtc/rtc-at91sam9.c | 34 ++++++++++++---------------------- 1 files changed, 12 insertions(+), 22 deletions(-) diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c index 39cfd2e..7b77c27 100644 --- a/drivers/rtc/rtc-at91sam9.c +++ b/drivers/rtc/rtc-at91sam9.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -309,7 +310,7 @@ static int at91_rtc_probe(struct platform_device *pdev) return irq; } - rtc = kzalloc(sizeof *rtc, GFP_KERNEL); + rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL); if (!rtc) return -ENOMEM; @@ -320,18 +321,19 @@ static int at91_rtc_probe(struct platform_device *pdev) device_init_wakeup(&pdev->dev, 1); platform_set_drvdata(pdev, rtc); - rtc->rtt = ioremap(r->start, resource_size(r)); + rtc->rtt = devm_ioremap(&pdev->dev, r->start, resource_size(r)); if (!rtc->rtt) { dev_err(&pdev->dev, "failed to map registers, aborting.\n"); ret = -ENOMEM; goto fail; } - rtc->gpbr = ioremap(r_gpbr->start, resource_size(r_gpbr)); + rtc->gpbr = devm_ioremap(&pdev->dev, r_gpbr->start, + resource_size(r_gpbr)); if (!rtc->gpbr) { dev_err(&pdev->dev, "failed to map gpbr registers, aborting.\n"); ret = -ENOMEM; - goto fail_gpbr; + goto fail; } mr = rtt_readl(rtc, MR); @@ -346,20 +348,19 @@ static int at91_rtc_probe(struct platform_device *pdev) mr &= ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN); rtt_writel(rtc, MR, mr); - rtc->rtcdev = rtc_device_register(pdev->name, &pdev->dev, - &at91_rtc_ops, THIS_MODULE); + rtc->rtcdev = devm_rtc_device_register(&pdev->dev, pdev->name, + &at91_rtc_ops, THIS_MODULE); if (IS_ERR(rtc->rtcdev)) { ret = PTR_ERR(rtc->rtcdev); - goto fail_register; + goto fail; } /* register irq handler after we know what name we'll use */ - ret = request_irq(rtc->irq, at91_rtc_interrupt, IRQF_SHARED, - dev_name(&rtc->rtcdev->dev), rtc); + ret = devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt, + IRQF_SHARED, dev_name(&rtc->rtcdev->dev), rtc); if (ret) { dev_dbg(&pdev->dev, "can't share IRQ %d?\n", rtc->irq); - rtc_device_unregister(rtc->rtcdev); - goto fail_register; + goto fail; } /* NOTE: sam9260 rev A silicon has a ROM bug which resets the @@ -374,13 +375,8 @@ static int at91_rtc_probe(struct platform_device *pdev) return 0; -fail_register: - iounmap(rtc->gpbr); -fail_gpbr: - iounmap(rtc->rtt); fail: platform_set_drvdata(pdev, NULL); - kfree(rtc); return ret; } @@ -394,14 +390,8 @@ static int at91_rtc_remove(struct platform_device *pdev) /* disable all interrupts */ rtt_writel(rtc, MR, mr & ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN)); - free_irq(rtc->irq, rtc); - - rtc_device_unregister(rtc->rtcdev); - iounmap(rtc->gpbr); - iounmap(rtc->rtt); platform_set_drvdata(pdev, NULL); - kfree(rtc); return 0; }