From patchwork Mon Apr 1 09:46:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 232702 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-vc0-f190.google.com (mail-vc0-f190.google.com [209.85.220.190]) (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 3A89B2C00C4 for ; Mon, 1 Apr 2013 20:46:13 +1100 (EST) Received: by mail-vc0-f190.google.com with SMTP id ht11sf909171vcb.17 for ; Mon, 01 Apr 2013 02:46:11 -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=aKxWXlt3ruOigXmP/z3tYqkf3vsK7KTZk1cKFxyuGLw=; b=MqcIia/9jfqO1iumPiU0s75djMyvTsYXqODlYDthND+6cbnzsGIEn3iU0Jzpr8RsTT dSRDuT9OAWyXODnMHfnwgn54YE9IyGfBXCFsVFm9Vhtn7bUtZ9vGwyKkxGxTOe2dX9eW 9uKBbSi6oPIOvpnMXqn/cxhT7HsKGGCaojoc6aZwekUlV8MifUv/SX6hyYd+kdDSHVoq bRheCh2Q8/YKWfPz1FngANBZt7eHuo4sO8f7SNQKUNvzUGQqNQdo0dkLw3IpDnMix4Zi Et+/3ENy1J8UP1Rtwj8ZWZr9D3nm0c23p1R92bHMj0nsZ+X7cyKGUKH6/t63TUxrXVWV Luuw== X-Received: by 10.50.178.244 with SMTP id db20mr782612igc.12.1364809571347; Mon, 01 Apr 2013 02:46:11 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.171.38 with SMTP id ar6ls905484igc.35.canary; Mon, 01 Apr 2013 02:46:11 -0700 (PDT) X-Received: by 10.67.11.67 with SMTP id eg3mr2266019pad.36.1364809571156; Mon, 01 Apr 2013 02:46:11 -0700 (PDT) Received: from mailout4.samsung.com (mailout4.samsung.com. [203.254.224.34]) by gmr-mx.google.com with ESMTP id xb6si2214448pab.0.2013.04.01.02.46.10; Mon, 01 Apr 2013 02:46:11 -0700 (PDT) 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 epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MKK000NPLSY24X0@mailout4.samsung.com> for rtc-linux@googlegroups.com; Mon, 01 Apr 2013 18:46:10 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.47]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 17.31.05174.26759515; Mon, 01 Apr 2013 18:46:10 +0900 (KST) X-AuditID: cbfee68f-b7f4a6d000001436-45-515957625ed2 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 37.57.13494.26759515; Mon, 01 Apr 2013 18:46:10 +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 <0MKK00A13LSXLJ90@mmp1.samsung.com>; Mon, 01 Apr 2013 18:46:10 +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 12/27] rtc: rtc-max8998: use devm_*() functions Date: Mon, 01 Apr 2013 18:46:09 +0900 Message-id: <001701ce2ebd$bd469820$37d3c860$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac4uvSmu8Ej3RSKpRZmzfFm2iz9KEwAAIdbA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOIsWRmVeSWpSXmKPExsVy+t8zfd2k8MhAgx0r+SyWXLzKbjFn/Ro2 i8sLL7FaXN41h81if2cHowOrx56JJ9k8Tsz4zeLRt2UVo8f0eT+ZPD5vkgtgjeKySUnNySxL LdK3S+DKWHOqib3gCV/FisYHzA2Ms3i6GDk5JARMJP7Oa2KHsMUkLtxbzwZiCwksY5T4+5QD pmbf8k1ANVxA8UWMEtcnvWWFcH4xSpxa+ZMVpIpNQE3iy5fDQFUcHCIC+hJtLRogNcwCvYwS Z3p3s0NMtZX4cfY7M4jNKWAn8WbhPEYQW1jAXqLpxgmwGhYBVYnpPw8xgdi8QPX/W9+wQtiC Ej8m32MBsZkFtCTW7zzOBGHLS2xe85YZZK+EgLrEo7+6IGERASOJjodvmCFKRCT2vXjHCHKP hMAjdondj9ezQuwSkPg2+RALRK+sxKYDzBAPS0ocXHGDZQKjxCwkm2ch2TwLyeZZSFYsYGRZ xSiaWpBcUJyUXmSsV5yYW1yal66XnJ+7iRESqf07GO8esD7EmAy0fiKzlGhyPjDS80riDY3N jCxMTUyNjcwtzUgTVhLnVWuxDhQSSE8sSc1OTS1ILYovKs1JLT7EyMTBKdXAOGHrlTLTOx/3 Pdr1S+CIWIsE4+sIgY6X7R3l+0+5fe+18xDruLNt/yK51e3LWMOyjS4UT2bImvRf1323upiz kle9UfLBb7O2eK2Ld59eOOvxv0OK32c+CL6bpN9mWPR70aGFOg1TXmkf3V0z/bXrusC0so0n TIOMtTIvHL1965F/0D7NtenhQUosxRmJhlrMRcWJAKn4D1/qAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKKsWRmVeSWpSXmKPExsVy+t9jAd2k8MhAg+V/OS2WXLzKbjFn/Ro2 i8sLL7FaXN41h81if2cHowOrx56JJ9k8Tsz4zeLRt2UVo8f0eT+ZPD5vkgtgjWpgtMlITUxJ LVJIzUvOT8nMS7dV8g6Od443NTMw1DW0tDBXUshLzE21VXLxCdB1y8wB2q6kUJaYUwoUCkgs LlbSt8M0ITTETdcCpjFC1zckCK7HyAANJKxjzFhzqom94AlfxYrGB8wNjLN4uhg5OSQETCT2 Ld/EDmGLSVy4t56ti5GLQ0hgEaPE9UlvWSGcX4wSp1b+ZAWpYhNQk/jy5TBQBweHiIC+RFuL BkgNs0Avo8SZ3t1gk4QEbCV+nP3ODGJzCthJvFk4jxHEFhawl2i6cQKshkVAVWL6z0NMIDYv UP3/1jesELagxI/J91hAbGYBLYn1O48zQdjyEpvXvGUG2SshoC7x6K8uSFhEwEii4+EbZogS EYl9L94xTmAUmoVk0iwkk2YhmTQLScsCRpZVjKKpBckFxUnpuUZ6xYm5xaV56XrJ+bmbGMGJ 4Jn0DsZVDRaHGAU4GJV4eCMuRAQKsSaWFVfmHmKU4GBWEuH1+QYU4k1JrKxKLcqPLyrNSS0+ xJgM9OhEZinR5HxgksoriTc0NjEzsjQyszAyMTcnTVhJnPdgq3WgkEB6YklqdmpqQWoRzBYm Dk6pBkbNb8GxEc4zHdw5s59Y/prc+8ub36P7bJzcm4WlpUHvKo9dKBMr+WqwUfXTo9mXoh6n MOz5tCC1nz/j29qkFwpVIkatXGr5RSbqmZrzQx4HzKs4ZHiKfcWDnL25u1KPKgg71wSuF+v6 fTEw/M3SdWczKqY5BmyX2FC8NfRI7h7zOJlPur079yuxFGckGmoxFxUnAgAAJyblSAMAAA== 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 Use devm_*() functions to make cleanup paths simpler. Signed-off-by: Jingoo Han --- drivers/rtc/rtc-max8998.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/rtc/rtc-max8998.c b/drivers/rtc/rtc-max8998.c index 8f234a0..48b6612 100644 --- a/drivers/rtc/rtc-max8998.c +++ b/drivers/rtc/rtc-max8998.c @@ -256,7 +256,8 @@ static int max8998_rtc_probe(struct platform_device *pdev) struct max8998_rtc_info *info; int ret; - info = kzalloc(sizeof(struct max8998_rtc_info), GFP_KERNEL); + info = devm_kzalloc(&pdev->dev, sizeof(struct max8998_rtc_info), + GFP_KERNEL); if (!info) return -ENOMEM; @@ -267,7 +268,7 @@ static int max8998_rtc_probe(struct platform_device *pdev) platform_set_drvdata(pdev, info); - info->rtc_dev = rtc_device_register("max8998-rtc", &pdev->dev, + info->rtc_dev = devm_rtc_device_register(&pdev->dev, "max8998-rtc", &max8998_rtc_ops, THIS_MODULE); if (IS_ERR(info->rtc_dev)) { @@ -276,8 +277,8 @@ static int max8998_rtc_probe(struct platform_device *pdev) goto out_rtc; } - ret = request_threaded_irq(info->irq, NULL, max8998_rtc_alarm_irq, 0, - "rtc-alarm0", info); + ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL, + max8998_rtc_alarm_irq, 0, "rtc-alarm0", info); if (ret < 0) dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n", @@ -294,20 +295,11 @@ static int max8998_rtc_probe(struct platform_device *pdev) out_rtc: platform_set_drvdata(pdev, NULL); - kfree(info); return ret; } static int max8998_rtc_remove(struct platform_device *pdev) { - struct max8998_rtc_info *info = platform_get_drvdata(pdev); - - if (info) { - free_irq(info->irq, info); - rtc_device_unregister(info->rtc_dev); - kfree(info); - } - return 0; }