From patchwork Wed Mar 6 05:36:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 225333 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-vc0-f183.google.com (mail-vc0-f183.google.com [209.85.220.183]) (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 E8F012C0378 for ; Wed, 6 Mar 2013 16:36:36 +1100 (EST) Received: by mail-vc0-f183.google.com with SMTP id m18sf3629333vcm.20 for ; Tue, 05 Mar 2013 21:36:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=x-received:x-beenthere:x-received: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=Nxt0vP9yu+VshiC6Ewwkp1E2Vb6HRwFrWEa/dhSTIP0=; b=tu33J+Xkgx0yca8Yn9Jfm2qFAOUUWJQrVEQ0X2orkgns0e98lVKrmoTeaEH8Treecg hqYTqTUNIfnV+cCRr6tcrGQFGhdPveGjrkFIE0/k2qb0TzMBbD/6JgBqHZgOtQBfsD0X pPW05eNsoWPGjjPCxN1gfnoXupu04H9gJHl7yheMMHyQT3KBqLf1iSqEXqSNepSCBosT mUnLPnEMFnxUZPBdyXnFwcNwrT0ZblnQN081gxgJvAwB+rmMJNH4VWvjKBK0iE8/cFvn 49TY6dOdP8hzlzlSTtSsi5cdq0IiXowp17RNayzMEYqld3SoqshWKyE+EYU1zuPVxogi EXVw== X-Received: by 10.50.180.197 with SMTP id dq5mr1732293igc.17.1362548194069; Tue, 05 Mar 2013 21:36:34 -0800 (PST) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.208.102 with SMTP id md6ls176248igc.11.canary; Tue, 05 Mar 2013 21:36:33 -0800 (PST) X-Received: by 10.68.234.202 with SMTP id ug10mr5132422pbc.6.1362548193569; Tue, 05 Mar 2013 21:36:33 -0800 (PST) X-Received: by 10.68.234.202 with SMTP id ug10mr5132421pbc.6.1362548193558; Tue, 05 Mar 2013 21:36:33 -0800 (PST) Received: from mailout4.samsung.com (mailout4.samsung.com. [203.254.224.34]) by gmr-mx.google.com with ESMTP id ka10si7604168pbb.2.2013.03.05.21.36.33; Tue, 05 Mar 2013 21:36:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of jg1.han@samsung.com designates 203.254.224.34 as permitted sender) client-ip=203.254.224.34; Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MJ80086T4WVQOL0@mailout4.samsung.com> for rtc-linux@googlegroups.com; Wed, 06 Mar 2013 14:36:32 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.50]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 54.B6.25214.FD5D6315; Wed, 06 Mar 2013 14:36:31 +0900 (KST) X-AuditID: cbfee68e-b7fa46d00000627e-06-5136d5dfc435 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 7E.2C.03880.FD5D6315; Wed, 06 Mar 2013 14:36:31 +0900 (KST) Received: from DOJG1HAN02 ([12.23.120.99]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MJ8001F34WVHBY0@mmp2.samsung.com>; Wed, 06 Mar 2013 14:36:31 +0900 (KST) From: Jingoo Han To: 'Andrew Morton' Cc: linux-kernel@vger.kernel.org, 'Alessandro Zummo' , rtc-linux@googlegroups.com, 'Jingoo Han' References: <004301ce1a2b$3ad77e00$b0867a00$%han@samsung.com> In-reply-to: <004301ce1a2b$3ad77e00$b0867a00$%han@samsung.com> Subject: [rtc-linux] [PATCH 28/30] rtc: rtc-tx4939: use devm_rtc_device_register() Date: Wed, 06 Mar 2013 14:36:31 +0900 Message-id: <005e01ce1a2c$8ec5e460$ac51ad20$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac4aKzqYzbgO1ZcaTfGsrpjfTnOAiQAAUaVg X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCIsWRmVeSWpSXmKPExsVy+t8zI937V80CDXa8NLNYcvEqu8Wc9WvY LC4vvMRqcXnXHDaL/Z0djA6sHnsmnmTzODHjN4tH35ZVjB7T5/1k8vi8SS6ANYrLJiU1J7Ms tUjfLoEro//UJJaCG1wVBy/tYW9gbObsYuTgkBAwkej7V9XFyAlkiklcuLeerYuRi0NIYBmj xPvOJWwwNTf3lkDEpzNKzGn5wAjh/GKUuDX9NSNIN5uAmsSXL4fZQRpEBPQl2lo0QGqYBXoZ Jc707mYHqRESsJW42r2KGcTmFLCTWP54FguILSzgJjHz+D1WkF4WAVWJNZMdQUxeoPJDl0NA KngFBCV+TL4HVs0soCWxfudxJghbXmLzmrfMEGeqSzz6qwsSFhEwknh3aBEbRImIxL4X78Au lhB4xC6xaeJFsASLgIDEt8mHWCB6ZSU2HWCGBIOkxMEVN1gmMErMQrJ5FpLNs5BsnoVkxQJG llWMoqkFyQXFSelFRnrFibnFpXnpesn5uZsYITHat4Px5gHrQ4zJQOsnMkuJJucDYzyvJN7Q 2NjEzMTUxNzS1NyUNGElcV75SzKBQgLpiSWp2ampBalF8UWlOanFhxiZODilGhi7FQ8tuX2I oZS7RezazM+bt54xU/mxeltz1ptjZ5dct97AKi587ahn/VxFlm91WZuDzpjOmXLB6arqH/62 YA+Fx6u2C+rsrKk6pWPGUzdp1WV/F5UZOtuDSicEvg6+teFml6+c1qHPESt/rPq46ddJ+bk8 58NWqgkl2XsUz/y+o65Wbs40Dh0uJZbijERDLeai4kQAVzbO3ucCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrEKsWRmVeSWpSXmKPExsVy+t9jQd37V80CDda9NrRYcvEqu8Wc9WvY LC4vvMRqcXnXHDaL/Z0djA6sHnsmnmTzODHjN4tH35ZVjB7T5/1k8vi8SS6ANaqB0SYjNTEl tUghNS85PyUzL91WyTs43jne1MzAUNfQ0sJcSSEvMTfVVsnFJ0DXLTMHaLuSQlliTilQKCCx uFhJ3w7ThNAQN10LmMYIXd+QILgeIwM0kLCOMaP/1CSWghtcFQcv7WFvYGzm7GLk4JAQMJG4 ubeki5ETyBSTuHBvPVsXIxeHkMB0Rok5LR8YIZxfjBK3pr9mBKliE1CT+PLlMDtIs4iAvkRb iwZIDbNAL6PEmd7d7CA1QgK2Ele7VzGD2JwCdhLLH89iAbGFBdwkZh6/xwrSyyKgKrFmsiOI yQtUfuhyCEgFr4CgxI/J98CqmQW0JNbvPM4EYctLbF7zlhniZHWJR391QcIiAkYS7w4tYoMo EZHY9+Id4wRGoVlIJs1CMmkWkkmzkLQsYGRZxSiaWpBcUJyUnmukV5yYW1yal66XnJ+7iRGc Ap5J72Bc1WBxiFGAg1GJh3eCilmgEGtiWXFl7iFGCQ5mJRFerjNAId6UxMqq1KL8+KLSnNTi Q4zJQG9OZJYSTc4Hpqe8knhDYxMzI0sjMwsjE3Nz0oSVxHkZTz0JEBJITyxJzU5NLUgtgtnC xMEp1cBo/lTRaZX461uzVj30ObB0sfJBnxdl55LbmwQ//Yxn3hy9Z3f93UsVgZ8vbjrOl13b 6cEn/tFqmXDerNURTyTlVUT6l7Ad1Yq9zXDE62Ovu7Ve+kaVC4m6V5sPt+kY7S7/7+W7ynr9 A1ffU20XJB3L9mcWOr3YF5fazcdxZ8WhKvZHE6Xv6WQosRRnJBpqMRcVJwIARrviIEUDAAA= 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.34 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 devm_rtc_device_register() is device managed and makes cleanup paths simpler. Signed-off-by: Jingoo Han --- drivers/rtc/rtc-tx4939.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c index a12bfac..9643116 100644 --- a/drivers/rtc/rtc-tx4939.c +++ b/drivers/rtc/rtc-tx4939.c @@ -268,14 +268,13 @@ static int __init tx4939_rtc_probe(struct platform_device *pdev) if (devm_request_irq(&pdev->dev, irq, tx4939_rtc_interrupt, 0, pdev->name, &pdev->dev) < 0) return -EBUSY; - rtc = rtc_device_register(pdev->name, &pdev->dev, + rtc = devm_rtc_device_register(pdev->name, &pdev->dev, &tx4939_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) return PTR_ERR(rtc); pdata->rtc = rtc; ret = sysfs_create_bin_file(&pdev->dev.kobj, &tx4939_rtc_nvram_attr); - if (ret) - rtc_device_unregister(rtc); + return ret; } @@ -284,7 +283,6 @@ static int __exit tx4939_rtc_remove(struct platform_device *pdev) struct tx4939rtc_plat_data *pdata = platform_get_drvdata(pdev); sysfs_remove_bin_file(&pdev->dev.kobj, &tx4939_rtc_nvram_attr); - rtc_device_unregister(pdata->rtc); spin_lock_irq(&pdata->lock); tx4939_rtc_cmd(pdata->rtcreg, TX4939_RTCCTL_COMMAND_NOP); spin_unlock_irq(&pdata->lock);