From patchwork Wed Mar 6 07:49:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 225398 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-qe0-f55.google.com (mail-qe0-f55.google.com [209.85.128.55]) (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 9F95F2C03A2 for ; Wed, 6 Mar 2013 18:49:31 +1100 (EST) Received: by mail-qe0-f55.google.com with SMTP id 1sf3346871qee.10 for ; Tue, 05 Mar 2013 23:49:29 -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=qskdzA/5yWV9xb679XQxMdPZB30ZBKmbswAPFwPEmEQ=; b=NW26yPfYYdTCk9QHBaD5zVAnWIef7ZNnVp/XiWtBwfWtAemOhQ3P6ThOtGSga7ZDnd bd1FN4zfu7p0N+HkpN5cbejeUT/gOavazyd30CvpWhhvEWF0LH01dCe/S2PqzKiJJiBs UCN0KUHFTtOlYzQTFKDlz/CMyg12tLGJiuTuj+cEK7/xcme/9Xf///GcpIEaBLMGRPfv lTCo+JHZPiFsHseKcvNqJ6G5QgnxzPiMyu8ZDF9lEX5AZTf16hn7EKma8yUkB8n4Tkyq dpXzZ0Ap98ywmO5UjtNKmFuc9asvK6SwSSseurIuarM65LihlRBrfMoUSgX67PLW8FRW k6qA== X-Received: by 10.50.161.225 with SMTP id xv1mr1752558igb.15.1362556168963; Tue, 05 Mar 2013 23:49:28 -0800 (PST) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.89.138 with SMTP id bo10ls246449igb.9.canary; Tue, 05 Mar 2013 23:49:28 -0800 (PST) X-Received: by 10.68.136.104 with SMTP id pz8mr7408013pbb.3.1362556168515; Tue, 05 Mar 2013 23:49:28 -0800 (PST) X-Received: by 10.68.136.104 with SMTP id pz8mr7408010pbb.3.1362556168505; Tue, 05 Mar 2013 23:49:28 -0800 (PST) Received: from mailout3.samsung.com (mailout3.samsung.com. [203.254.224.33]) by gmr-mx.google.com with ESMTP id ka10si7763492pbb.2.2013.03.05.23.49.28; Tue, 05 Mar 2013 23:49:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of jg1.han@samsung.com designates 203.254.224.33 as permitted sender) client-ip=203.254.224.33; Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MJ800F7BB1FO9P0@mailout3.samsung.com> for rtc-linux@googlegroups.com; Wed, 06 Mar 2013 16:49:27 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.47]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id CD.26.17763.705F6315; Wed, 06 Mar 2013 16:49:27 +0900 (KST) X-AuditID: cbfee690-b7f6b6d000004563-f6-5136f507a9e4 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id CE.CD.03918.705F6315; Wed, 06 Mar 2013 16:49:27 +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 <0MJ800BFVB2F9E00@mmp2.samsung.com>; Wed, 06 Mar 2013 16:49:27 +0900 (KST) From: Jingoo Han To: 'Andrew Morton' Cc: linux-kernel@vger.kernel.org, 'Alessandro Zummo' , rtc-linux@googlegroups.com, 'Jingoo Han' References: <007b01ce1a3e$cd9f3260$68dd9720$%han@samsung.com> In-reply-to: <007b01ce1a3e$cd9f3260$68dd9720$%han@samsung.com> Subject: [rtc-linux] [PATCH V2 06/30] rtc: rtc-ds1511: use devm_rtc_device_register() Date: Wed, 06 Mar 2013 16:49:27 +0900 Message-id: <008001ce1a3f$20a3ca70$61eb5f50$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac4aPs2G+X8TED9/S2OjRUc7S5yKjAAAET4w X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGIsWRmVeSWpSXmKPExsVy+t8zfV32r2aBBu0dihZLLl5lt5izfg2b xeWFl1gtLu+aw2axv7OD0YHVY8/Ek2weJ2b8ZvHo27KK0WP6vJ9MHp83yQWwRnHZpKTmZJal FunbJXBlzDnxnr2gg6ti1aPbzA2MSzm6GDk5JARMJJbMWM4MYYtJXLi3ng3EFhJYxijRcksC pmbp9/vsXYxcQPHpjBLnNk5kgnB+MUq09k8A62ATUJP48uUwUBUHh4iAvkRbiwZIDbNAL6PE md7dYHEhAVuJnnk8IOWcAnYSUyY+ZgexhQU8JS787GMCsVkEVCWO3b8KZvMClX//v5sZwhaU +DH5HguIzSygJbF+53EmCFteYvOat8wg4yUE1CUe/dUFCYsIGEncvLsKqkREYt+Ld4wg50gI 3GOX2DX7PtQuAYlvkw+xQPTKSmw6AA0HSYmDK26wTGCUmIVk8ywkm2ch2TwLyYoFjCyrGEVT C5ILipPSi0z0ihNzi0vz0vWS83M3MULidMIOxnsHrA8xJgOtn8gsJZqcD4zzvJJ4Q2NjEzMT UxNzS1NzU9KElcR55S/JBAoJpCeWpGanphakFsUXleakFh9iZOLglGpgrJ59Uuy45E1Fjq+7 JC3/SM64zVJSEMo3p+P2o+jkD6aZwbNzTqx3dXifETl/94GO5LvntywNNTmql/OA7eFiF+3l zaLcrbeuPGzb896jv+VBvlGtpvfPmLZX3TPXlr97H9YhvvSmdlXSqWPBUy+WuGkbHef4NO/Q hrPvZ/vWeL60mPY+gPGLhhJLcUaioRZzUXEiAAi6pT3pAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCKsWRmVeSWpSXmKPExsVy+t9jQV32r2aBBrOuyFgsuXiV3WLO+jVs FpcXXmK1uLxrDpvF/s4ORgdWjz0TT7J5nJjxm8Wjb8sqRo/p834yeXzeJBfAGtXAaJORmpiS WqSQmpecn5KZl26r5B0c7xxvamZgqGtoaWGupJCXmJtqq+TiE6DrlpkDtF1JoSwxpxQoFJBY XKykb4dpQmiIm64FTGOErm9IEFyPkQEaSFjHmDHnxHv2gg6uilWPbjM3MC7l6GLk5JAQMJFY +v0+O4QtJnHh3nq2LkYuDiGB6YwS5zZOZIJwfjFKtPZPYAOpYhNQk/jy5TBQBweHiIC+RFuL BkgNs0Avo8SZ3t1gcSEBW4meeTwg5ZwCdhJTJj4GWyAs4Clx4WcfE4jNIqAqcez+VTCbF6j8 +//dzBC2oMSPyfdYQGxmAS2J9TuPM0HY8hKb17xlBhkvIaAu8eivLkhYRMBI4ubdVVAlIhL7 XrxjnMAoNAvJpFlIJs1CMmkWkpYFjCyrGEVTC5ILipPScw31ihNzi0vz0vWS83M3MYLTwDOp HYwrGywOMQpwMCrx8FoomQUKsSaWFVfmHmKU4GBWEuHlOgMU4k1JrKxKLcqPLyrNSS0+xJgM 9OhEZinR5HxgisoriTc0NjEzsjQyszAyMTcnTVhJnJfx1JMAIYH0xJLU7NTUgtQimC1MHJxS DYz71121uRSs8ZD/whGlSZfvhWzYe/6vTg53l9xaH5GNTC9XPr1h92nStFtHg5utV6z0+F7Q UMm8JfTQwvX8y5iM1m+9VhFyW5LDlP8i/9qHErnxHbPer7O79eZow3nFPxfPV/7f3fRgt+y1 G0J7ed7Iu5hU9bb8MuTtj1FLXr9A+83HEv4Lpc+FlFiKMxINtZiLihMBDzzBt0cDAAA= 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.33 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 --- Changes since v1: - used 'struct device *dev' as the first argument drivers/rtc/rtc-ds1511.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c index 6a3fcfe..6ce8a99 100644 --- a/drivers/rtc/rtc-ds1511.c +++ b/drivers/rtc/rtc-ds1511.c @@ -538,15 +538,14 @@ static int ds1511_rtc_probe(struct platform_device *pdev) } } - rtc = rtc_device_register(pdev->name, &pdev->dev, &ds1511_rtc_ops, - THIS_MODULE); + rtc = devm_rtc_device_register(&pdev->dev, pdev->name, &ds1511_rtc_ops, + THIS_MODULE); if (IS_ERR(rtc)) return PTR_ERR(rtc); pdata->rtc = rtc; ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1511_nvram_attr); - if (ret) - rtc_device_unregister(pdata->rtc); + return ret; } @@ -555,7 +554,6 @@ static int ds1511_rtc_remove(struct platform_device *pdev) struct rtc_plat_data *pdata = platform_get_drvdata(pdev); sysfs_remove_bin_file(&pdev->dev.kobj, &ds1511_nvram_attr); - rtc_device_unregister(pdata->rtc); if (pdata->irq > 0) { /* * disable the alarm interrupt