From patchwork Mon Apr 1 09:50:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 232718 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-da0-x23a.google.com (mail-da0-x23a.google.com [IPv6:2607:f8b0:400e:c00::23a]) (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 11AA32C00B9 for ; Mon, 1 Apr 2013 20:50:53 +1100 (EST) Received: by mail-da0-f58.google.com with SMTP id d39sf942864dal.3 for ; Mon, 01 Apr 2013 02:50:52 -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=V7l5y8L03jw5av+lVQtd9bj9ToRG9SyWT3pK1KoRvnM=; b=OW+n2OTocpbHybzvC4jA1hxuSdbjFWUlSyJ4IuTHBe9ioUvLuti256GlYglk4+Go0D Ub5b9QD7LMbAU8ofxOxloYiig9rdqyQRoD8F+11hxtz/IvOoMREEdT5o0Axa/cj0T1xT zZkryJLHHO1Bkrlz1JjF0Teb1dIQ4CB5cl3yugm2UoaKR/MUxE8okV/Mh/Dmve109wnW zFDvLWHdxUTKFoGZjlLuRFtRLm9CMlzpDsGWWBQJHaGTVrQnmJnEokGiHwmfRyamKcba S84FgSOlC17kAyfIcKzaW74tokjnGzbFVh5BUB5AJ7gDEHG2YG2PsHdFuhHbNzo0NGYn PKeg== X-Received: by 10.50.161.225 with SMTP id xv1mr783687igb.15.1364809852139; Mon, 01 Apr 2013 02:50:52 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.203.40 with SMTP id kn8ls908737igc.17.canary; Mon, 01 Apr 2013 02:50:50 -0700 (PDT) X-Received: by 10.66.175.228 with SMTP id cd4mr2336399pac.24.1364809850798; Mon, 01 Apr 2013 02:50:50 -0700 (PDT) Received: from mailout3.samsung.com (mailout3.samsung.com. [203.254.224.33]) by gmr-mx.google.com with ESMTP id gl10si2214886pac.2.2013.04.01.02.50.50; Mon, 01 Apr 2013 02:50:50 -0700 (PDT) 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 epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MKK00E33M0PUAX0@mailout3.samsung.com> for rtc-linux@googlegroups.com; Mon, 01 Apr 2013 18:50:49 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.48]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 06.13.05174.97859515; Mon, 01 Apr 2013 18:50:49 +0900 (KST) X-AuditID: cbfee68f-b7f4a6d000001436-06-5159587952c5 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 62.65.17838.97859515; Mon, 01 Apr 2013 18:50:49 +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 <0MKK00C8CM0PAI10@mmp1.samsung.com>; Mon, 01 Apr 2013 18:50:49 +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 27/27] rtc: rtc-v3020: use devm_*() functions Date: Mon, 01 Apr 2013 18:50:49 +0900 Message-id: <002601ce2ebe$63efb1c0$2bcf1540$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac4uvSmu8Ej3RSKpRZmzfFm2iz9KEwAAS/DA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGIsWRmVeSWpSXmKPExsVy+t8zA93KiMhAg3OTTS2WXLzKbjFn/Ro2 i8sLL7FaXN41h81if2cHowOrx56JJ9k8Tsz4zeLRt2UVo8f0eT+ZPD5vkgtgjeKySUnNySxL LdK3S+DK6F0ZVbCMu+LIqhbmBsbpnF2MnBwSAiYSR/98Z4awxSQu3FvP1sXIxSEksIxRYvnl O6wwRVceLWOFSCxilDh44CELhPOLUeLf4/9sIFVsAmoSX74cZu9i5OAQEdCXaGvRAKlhFuhl lDjTu5sdpEZIwFbix1mIdZwCdhJvFs5jBLGFgeIrHl1lAbFZBFQlZjY/ZgaZwwsU/3IjFyTM KyAo8WPyPbASZgEtifU7jzNB2PISm9e8BSuXEFCXePRXFyQsImAkMf/dJahyEYl9L94xgpwj IfCIXaJz6X5WiFUCEt8mH2KB6JWV2HQAGhCSEgdX3GCZwCgxC8nmWUg2z0KyeRaSFQsYWVYx iqYWJBcUJ6UXGesVJ+YWl+al6yXn525ihMRp/w7GuwesDzEmA62fyCwlmpwPjPO8knhDYzMj C1MTU2Mjc0sz0oSVxHnVWqwDhQTSE0tSs1NTC1KL4otKc1KLDzEycXBKNTAevF15faqEym65 lX0ZpSUFi7s7Xs+bxzzlm0mr3fuakkWyigsmLIlju7eD4fRJBcWZlUcdXN+sqX/nv3F1TeiO w19fnTqncjib5XxO/iznVXOvVJjnx3P/vKJjsljn/a4vUfOLSjZs+lG6K+fYeXXFU8eern2/ RP/umdNfIg24Djz+pnbPpfhUjBJLcUaioRZzUXEiAJcIQYvpAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMKsWRmVeSWpSXmKPExsVy+t9jAd3KiMhAg+3thhZLLl5lt5izfg2b xeWFl1gtLu+aw2axv7OD0YHVY8/Ek2weJ2b8ZvHo27KK0WP6vJ9MHp83yQWwRjUw2mSkJqak Fimk5iXnp2TmpdsqeQfHO8ebmhkY6hpaWpgrKeQl5qbaKrn4BOi6ZeYAbVdSKEvMKQUKBSQW Fyvp22GaEBripmsB0xih6xsSBNdjZIAGEtYxZvSujCpYxl1xZFULcwPjdM4uRk4OCQETiSuP lrFC2GISF+6tZ+ti5OIQEljEKHHwwEMWCOcXo8S/x//ZQKrYBNQkvnw5zN7FyMEhIqAv0dai AVLDLNDLKHGmdzc7SI2QgK3Ej7PfmUFsTgE7iTcL5zGC2MJA8RWPrrKA2CwCqhIzmx8zg8zh BYp/uZELEuYVEJT4MfkeWAmzgJbE+p3HmSBseYnNa96ClUsIqEs8+qsLEhYRMJKY/+4SVLmI xL4X7xgnMArNQjJpFpJJs5BMmoWkZQEjyypG0dSC5ILipPRcQ73ixNzi0rx0veT83E2M4CTw TGoH48oGi0OMAhyMSjy8ERciAoVYE8uKK3MPMUpwMCuJ8Pp8AwrxpiRWVqUW5ccXleakFh9i TAb6cyKzlGhyPjBB5ZXEGxqbmBlZGplZGJmYm5MmrCTOe6DVOlBIID2xJDU7NbUgtQhmCxMH p1QDY4dq6mF1odIO4/kPmB6Gv9RecXZyjaKn6N/8vNzPfv6HpzvLCNV+4fxvt4w95ZQJV4bS 35m/t054dlrskW2Lk8S27LINb47MuGS8qibqWLngUo9jk9b/6V9iU8yyTO6Kj8icNws2zTL+ Lrv3ekvaNWeN8+3bA3uv6K23rz5ieOjOt60Prv9m+qjEUpyRaKjFXFScCAD8HfKkRgMAAA== 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 Use devm_*() functions to make cleanup paths simpler. Signed-off-by: Jingoo Han --- drivers/rtc/rtc-v3020.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c index 600798c..d87878e 100644 --- a/drivers/rtc/rtc-v3020.c +++ b/drivers/rtc/rtc-v3020.c @@ -296,7 +296,7 @@ static int rtc_probe(struct platform_device *pdev) int i; int temp; - chip = kzalloc(sizeof *chip, GFP_KERNEL); + chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL); if (!chip) return -ENOMEM; @@ -340,8 +340,8 @@ static int rtc_probe(struct platform_device *pdev) platform_set_drvdata(pdev, chip); - chip->rtc = rtc_device_register("v3020", - &pdev->dev, &v3020_rtc_ops, THIS_MODULE); + chip->rtc = devm_rtc_device_register(&pdev->dev, "v3020", + &v3020_rtc_ops, THIS_MODULE); if (IS_ERR(chip->rtc)) { retval = PTR_ERR(chip->rtc); goto err_io; @@ -352,21 +352,14 @@ static int rtc_probe(struct platform_device *pdev) err_io: chip->ops->unmap_io(chip); err_chip: - kfree(chip); - return retval; } static int rtc_remove(struct platform_device *dev) { struct v3020 *chip = platform_get_drvdata(dev); - struct rtc_device *rtc = chip->rtc; - - if (rtc) - rtc_device_unregister(rtc); chip->ops->unmap_io(chip); - kfree(chip); return 0; }