From patchwork Mon Apr 1 09:48:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 232708 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-vc0-f187.google.com (mail-vc0-f187.google.com [209.85.220.187]) (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 3C8DE2C00EC for ; Mon, 1 Apr 2013 20:48:06 +1100 (EST) Received: by mail-vc0-f187.google.com with SMTP id kw10sf916029vcb.14 for ; Mon, 01 Apr 2013 02:48:04 -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=ihrjHk2e9YRXx+Dl7MGkP55FdlU5dXWGRSXd0UMRMD8=; b=qhH9K1qqh+m8DHiByjgJu2yidaetBB+8aytX3TvtQA8KYLMSu06hYoz8p5BjpswW4z 3P8Fg0e9qmXk0hX+6Q+B5A6DJB98glOG+8e6SDR9f1kK4WJI3d72kEjio5O3izCpY3ai kLXoNapwYEarIWX5HCfw4UwkOt1i/XXxGx3Yd2eLbQSbW+wLXHlIq9KnVcqg9SPGbXxW dY9/f+RVEXpM3qZ9wirzVkY8znNd+p14TYGoXc5C+e6WtSKekQVRn2w48XSRwdoDFaE4 QJPFE1yxNy+4miWmiIIedP6nRM6VMUrreXPJ/xHSdY3rktqvAe1XIZwVYXMtU6xxPeth YRzA== X-Received: by 10.50.130.9 with SMTP id oa9mr793975igb.3.1364809684591; Mon, 01 Apr 2013 02:48:04 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.159.202 with SMTP id xe10ls877496igb.7.gmail; Mon, 01 Apr 2013 02:48:04 -0700 (PDT) X-Received: by 10.66.175.228 with SMTP id cd4mr2335098pac.24.1364809684361; Mon, 01 Apr 2013 02:48:04 -0700 (PDT) Received: from mailout2.samsung.com (mailout2.samsung.com. [203.254.224.25]) by gmr-mx.google.com with ESMTP id xb6si2215490pab.0.2013.04.01.02.48.04; Mon, 01 Apr 2013 02:48:04 -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 <0MKK00M6SLW04RZ0@mailout2.samsung.com> for rtc-linux@googlegroups.com; Mon, 01 Apr 2013 18:48:03 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.49]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id A9.D3.20872.3D759515; Mon, 01 Apr 2013 18:48:03 +0900 (KST) X-AuditID: cbfee68d-b7f786d000005188-f0-515957d30d82 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id A3.B4.17838.2D759515; Mon, 01 Apr 2013 18:48:02 +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 <0MKK00A6CLW2CP90@mmp1.samsung.com>; Mon, 01 Apr 2013 18:48:02 +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 18/27] rtc: rtc-pcf50633: use devm_*() functions Date: Mon, 01 Apr 2013 18:48:02 +0900 Message-id: <001d01ce2ebe$0048ad70$00da0850$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac4uvSmu8Ej3RSKpRZmzfFm2iz9KEwAAMwhQ X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOIsWRmVeSWpSXmKPExsVy+t8zQ93L4ZGBBlfXSlosuXiV3WLO+jVs FpcXXmK1uLxrDpvF/s4ORgdWjz0TT7J5nJjxm8Wjb8sqRo/p834yeXzeJBfAGsVlk5Kak1mW WqRvl8CV0Xp/A3PBIe6K6XN62BsYT3J2MXJySAiYSOx6No0VwhaTuHBvPVsXIxeHkMAyRolD 66ezwhQtW/2dFSKxiFHi0dlPUFW/GCWWPb7NBFLFJqAm8eXLYfYuRg4OEQF9ibYWDZAaZoFe RokzvbvZQWqEBGwlfpz9zgxicwrYSbxZOI8RxBYWcJDYerGFCaSXRUBVonmaHUiYF6i8qX0V C4QtKPFj8j0wm1lAS2L9zuNMELa8xOY1b5lBWiUE1CUe/dUFCYsIGEnc7Z/ODlEiIrHvxTtG kHMkBB6xS2xeBfExi4CAxLfJh1ggemUlNh1ghvhXUuLgihssExglZiHZPAvJ5llINs9CsmIB I8sqRtHUguSC4qT0IkO94sTc4tK8dL3k/NxNjJBI7d3BePuA9SHGZKD1E5mlRJPzgZGeVxJv aGxmZGFqYmpsZG5pRpqwkjivWot1oJBAemJJanZqakFqUXxRaU5q8SFGJg5OqQZGuy3KSjtm BXYceM0z4bnx0qCdl+uEG1rS7/+7k+7Y93bhtK3iqbcNzF7bXWK++W/RXPFJRbUTE/08uAQK xPRreSN+TtmyjrV/+2oZ06P34wp6pb+ouhp82PxF+9qvG/4WHMwBN4OsPpdVJkZWmH3zKnEz Y1i+xHY/p4KGxJvuPPUnnR/FDL8osRRnJBpqMRcVJwIADpEDa+oCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCKsWRmVeSWpSXmKPExsVy+t9jAd1L4ZGBBkf2mVksuXiV3WLO+jVs FpcXXmK1uLxrDpvF/s4ORgdWjz0TT7J5nJjxm8Wjb8sqRo/p834yeXzeJBfAGtXAaJORmpiS WqSQmpecn5KZl26r5B0c7xxvamZgqGtoaWGupJCXmJtqq+TiE6DrlpkDtF1JoSwxpxQoFJBY XKykb4dpQmiIm64FTGOErm9IEFyPkQEaSFjHmNF6fwNzwSHuiulzetgbGE9ydjFyckgImEgs W/2dFcIWk7hwbz1bFyMXh5DAIkaJR2c/QTm/GCWWPb7NBFLFJqAm8eXLYfYuRg4OEQF9ibYW DZAaZoFeRokzvbvZQWqEBGwlfpz9zgxicwrYSbxZOI8RxBYWcJDYerGFCaSXRUBVonmaHUiY F6i8qX0VC4QtKPFj8j0wm1lAS2L9zuNMELa8xOY1b5lBWiUE1CUe/dUFCYsIGEnc7Z/ODlEi IrHvxTvGCYxCs5BMmoVk0iwkk2YhaVnAyLKKUTS1ILmgOCk911CvODG3uDQvXS85P3cTIzgN PJPawbiyweIQowAHoxIPb8SFiEAh1sSy4srcQ4wSHMxKIrw+34BCvCmJlVWpRfnxRaU5qcWH GJOB/pzILCWanA9MUXkl8YbGJmZGlkZmFkYm5uakCSuJ8x5otQ4UEkhPLEnNTk0tSC2C2cLE wSnVwCh115JXO8qHVSIx4p5Y2LGKA2fd1a9K6x5ZZNXGMel++f6AbO+HWmmLJt1ZPetXu+zc yrsN+ds7t99RfnPHU+Kor/OdBWvr6p6Uvnv0yONIHOP+9nXSVUEWS/ueiSWxSjX+P8Pjdrmh 7Nyeracyt5jW3Fo1ZXvyr6AZtScTPmwLWfw3ZK2Zeo0SS3FGoqEWc1FxIgDu+3YKRwMAAA== 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-pcf50633.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c index e9f3135..e6b6911 100644 --- a/drivers/rtc/rtc-pcf50633.c +++ b/drivers/rtc/rtc-pcf50633.c @@ -252,20 +252,17 @@ static int pcf50633_rtc_probe(struct platform_device *pdev) { struct pcf50633_rtc *rtc; - rtc = kzalloc(sizeof(*rtc), GFP_KERNEL); + rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL); if (!rtc) return -ENOMEM; rtc->pcf = dev_to_pcf50633(pdev->dev.parent); platform_set_drvdata(pdev, rtc); - rtc->rtc_dev = rtc_device_register("pcf50633-rtc", &pdev->dev, + rtc->rtc_dev = devm_rtc_device_register(&pdev->dev, "pcf50633-rtc", &pcf50633_rtc_ops, THIS_MODULE); - if (IS_ERR(rtc->rtc_dev)) { - int ret = PTR_ERR(rtc->rtc_dev); - kfree(rtc); - return ret; - } + if (IS_ERR(rtc->rtc_dev)) + return PTR_ERR(rtc->rtc_dev); pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_ALARM, pcf50633_rtc_irq, rtc); @@ -277,12 +274,8 @@ static int pcf50633_rtc_remove(struct platform_device *pdev) struct pcf50633_rtc *rtc; rtc = platform_get_drvdata(pdev); - pcf50633_free_irq(rtc->pcf, PCF50633_IRQ_ALARM); - rtc_device_unregister(rtc->rtc_dev); - kfree(rtc); - return 0; }