From patchwork Mon Apr 1 09:46:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 232703 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-qc0-x237.google.com (mail-qc0-x237.google.com [IPv6:2607:f8b0:400d:c01::237]) (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 EC21D2C00C4 for ; Mon, 1 Apr 2013 20:46:31 +1100 (EST) Received: by mail-qc0-f183.google.com with SMTP id i13sf942889qcs.10 for ; Mon, 01 Apr 2013 02:46:29 -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=FPk8Vn7hNtb4iVebvmWuHq5g7ScymP3zWWPFHwejl3A=; b=fuDcTDyxFCXn/IeN90pcuq4hcIwpXYvaYqw5/Gci/VsAKP31+ikQsOXu7SOnjm9+oC hTJNbimd52jqJCkzO+rkdzrEiksxq8c9h+36UJdfmfbVo2A1fbg+TesbhQSCkFx6cRlR fBwy1XP8ZA7NE4Vj82h37Dj6aeRXY4hMWxDrWBM01axcSqC0eEkC/ckOBbew/IOz4PqX MQOk3TsWGu1ABCNAwFjyIMkuhh8HXmFudbsuTbgzIPhZMcOCKzZ7rGke5NwzSbHO1itU Iiv0cSKelpBzxzRW6h7BX9VGUL2klKSrSq41kCyVmwDIL0R07Ql8CNnktw6T9Brbf+dq /6OA== X-Received: by 10.50.60.1 with SMTP id d1mr505492igr.6.1364809589094; Mon, 01 Apr 2013 02:46:29 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.193.136 with SMTP id ho8ls904616igc.18.gmail; Mon, 01 Apr 2013 02:46:28 -0700 (PDT) X-Received: by 10.68.129.38 with SMTP id nt6mr2219307pbb.8.1364809588887; Mon, 01 Apr 2013 02:46:28 -0700 (PDT) Received: from mailout1.samsung.com (mailout1.samsung.com. [203.254.224.24]) by gmr-mx.google.com with ESMTP id cu1si2153026pbc.1.2013.04.01.02.46.28; Mon, 01 Apr 2013 02:46:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of jg1.han@samsung.com designates 203.254.224.24 as permitted sender) client-ip=203.254.224.24; Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MKK004ISLTESKM0@mailout1.samsung.com> for rtc-linux@googlegroups.com; Mon, 01 Apr 2013 18:46:27 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.50]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 4F.69.07735.37759515; Mon, 01 Apr 2013 18:46:27 +0900 (KST) X-AuditID: cbfee68e-b7f946d000001e37-e7-515957731faf Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id C2.67.13494.37759515; Mon, 01 Apr 2013 18:46:27 +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 <0MKK00A4OLTFLJ90@mmp1.samsung.com>; Mon, 01 Apr 2013 18:46:27 +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 13/27] rtc: rtc-mc13xxx: use devm_*() functions Date: Mon, 01 Apr 2013 18:46:26 +0900 Message-id: <001801ce2ebd$c77d5720$56780560$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac4uvSmu8Ej3RSKpRZmzfFm2iz9KEwAAJQkA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOIsWRmVeSWpSXmKPExsVy+t8zI93i8MhAg+VzpS2WXLzKbjFn/Ro2 i8sLL7FaXN41h81if2cHowOrx56JJ9k8Tsz4zeLRt2UVo8f0eT+ZPD5vkgtgjeKySUnNySxL LdK3S+DK+HlIr+Aob0XD3bVsDYzzubsYOTkkBEwktl27xg5hi0lcuLeerYuRi0NIYBmjxNWT k1hhipoafrBDJBYxSsxp+8MK4fxilHgw/xFYO5uAmsSXL4eBbA4OEQF9ibYWDZAaZoFeRokz vbvBaoQEbCV+nP3ODGJzCthJvFk4jxHEFhawl/h5pZUNxGYRUJV40LwRrJ4XqP5v/yZmCFtQ 4sfkeywgNrOAlsT6nceZIGx5ic1r3jKD7JUQUJd49FcXJCwiYCTxedYeqBIRiX0v3jGC3CMh cI9d4mLfP0aIXQIS3yYfYoHolZXYdIAZ4mFJiYMrbrBMYJSYhWTzLCSbZyHZPAvJigWMLKsY RVMLkguKk9KLjPSKE3OLS/PS9ZLzczcxQiK1bwfjzQPWhxiTgdZPZJYSTc4HRnpeSbyhsZmR hamJqbGRuaUZacJK4rxqLdaBQgLpiSWp2ampBalF8UWlOanFhxiZODilGhg1vq86Wc57turS 7lur62b9mXDK6Ow3nzu+uWs/TjDeZiSY6flk0wyDotwdSjf9Zjze9df5xLqIsIjViuqLtj92 3fHQ9EmoeUUp59mvpc+eF4oEvbt2gr1N7qxNdl9t7v0/O7RuZyVk/9hUkFd3T0GX4xTrhp23 dj8qUHxgmzXnQXjYXdbF53+6K7EUZyQaajEXFScCACmZ/OjqAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCKsWRmVeSWpSXmKPExsVy+t9jAd3i8MhAg7/PxSyWXLzKbjFn/Ro2 i8sLL7FaXN41h81if2cHowOrx56JJ9k8Tsz4zeLRt2UVo8f0eT+ZPD5vkgtgjWpgtMlITUxJ LVJIzUvOT8nMS7dV8g6Od443NTMw1DW0tDBXUshLzE21VXLxCdB1y8wB2q6kUJaYUwoUCkgs LlbSt8M0ITTETdcCpjFC1zckCK7HyAANJKxjzPh5SK/gKG9Fw921bA2M87m7GDk5JARMJJoa frBD2GISF+6tZ+ti5OIQEljEKDGn7Q8rhPOLUeLB/EdgVWwCahJfvhwGsjk4RAT0JdpaNEBq mAV6GSXO9O4GqxESsJX4cfY7M4jNKWAn8WbhPEYQW1jAXuLnlVY2EJtFQFXiQfNGsHpeoPq/ /ZuYIWxBiR+T77GA2MwCWhLrdx5ngrDlJTavecsMsldCQF3i0V9dkLCIgJHE51l7oEpEJPa9 eMc4gVFoFpJJs5BMmoVk0iwkLQsYWVYxiqYWJBcUJ6XnGukVJ+YWl+al6yXn525iBKeBZ9I7 GFc1WBxiFOBgVOLhjbgQESjEmlhWXJl7iFGCg1lJhNfnG1CINyWxsiq1KD++qDQntfgQYzLQ oxOZpUST84EpKq8k3tDYxMzI0sjMwsjE3Jw0YSVx3oOt1oFCAumJJanZqakFqUUwW5g4OKUa GJtaHjREVqa/rfGtYlnp/23WBielGxsXzdn05KFD/Vol5ifrhSN3t+357JLJw9sTMcdrtYDP 3RTD1Gt/LzKmum93MGg6+kzvR9J1safV2/jkSr9OLrl24cn6to9vjHU6vIJmevF8U9Y+wr6o ufKz2Ndpi6xEppmFFAl8LT6a8FdAh+f7oulvPiixFGckGmoxFxUnAgCfcRP0RwMAAA== 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.24 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-mc13xxx.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c index 5391b15..7a8ed27 100644 --- a/drivers/rtc/rtc-mc13xxx.c +++ b/drivers/rtc/rtc-mc13xxx.c @@ -316,7 +316,7 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev) struct mc13xxx *mc13xxx; int rtcrst_pending; - priv = kzalloc(sizeof(*priv), GFP_KERNEL); + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; @@ -351,8 +351,8 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev) mc13xxx_unlock(mc13xxx); - priv->rtc = rtc_device_register(pdev->name, - &pdev->dev, &mc13xxx_rtc_ops, THIS_MODULE); + priv->rtc = devm_rtc_device_register(&pdev->dev, pdev->name, + &mc13xxx_rtc_ops, THIS_MODULE); if (IS_ERR(priv->rtc)) { ret = PTR_ERR(priv->rtc); @@ -372,7 +372,6 @@ err_reset_irq_request: mc13xxx_unlock(mc13xxx); platform_set_drvdata(pdev, NULL); - kfree(priv); } return ret; @@ -384,8 +383,6 @@ static int __exit mc13xxx_rtc_remove(struct platform_device *pdev) mc13xxx_lock(priv->mc13xxx); - rtc_device_unregister(priv->rtc); - mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TODA, priv); mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_1HZ, priv); mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_RTCRST, priv); @@ -394,8 +391,6 @@ static int __exit mc13xxx_rtc_remove(struct platform_device *pdev) platform_set_drvdata(pdev, NULL); - kfree(priv); - return 0; }