From patchwork Mon Apr 1 09:45:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 232701 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-ye0-f186.google.com (mail-ye0-f186.google.com [209.85.213.186]) (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 E74822C00C4 for ; Mon, 1 Apr 2013 20:45:51 +1100 (EST) Received: by mail-ye0-f186.google.com with SMTP id m9sf943834yen.3 for ; Mon, 01 Apr 2013 02:45:49 -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=DCphdV+eLBC4Hi9Q2T1UxPfKvtpiiAZpM27CfTFj5J4=; b=VWmARBwSo7vIt4eBoozzFbi7eRCL3rbaE0HgWoRg8KRemC+VHKVkyLzqw21rwJeWCW nj/KmRwBCvsJNmPSQPx1nBu1XiszYlm+UDTCZfyMXsNpWbEW4ITj0wD8b+DFmv62xU9i fKjkBWViynIVwlGc4p1IR7Yl9Ub4d/7QgGAIImAmUpt1PegoFbnFf6Wq2ts/iU02XAtv wv8fLB/nm0Pg1P9gOmXBVJm9taGYBq2skPoJ/8uFC2GJdy35iDd+mGRJKlPb8rcYKIiK UKHx/rX99pHakvBZ2vXgAypZq0qCmQDoGoq+Pn/H5E2x4BCguudMTbat62cKeKQN4HxQ YVYA== X-Received: by 10.50.154.33 with SMTP id vl1mr784966igb.16.1364809549503; Mon, 01 Apr 2013 02:45:49 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.57.134 with SMTP id i6ls888768igq.12.canary; Mon, 01 Apr 2013 02:45:49 -0700 (PDT) X-Received: by 10.67.14.100 with SMTP id ff4mr2269917pad.44.1364809549276; Mon, 01 Apr 2013 02:45:49 -0700 (PDT) Received: from mailout2.samsung.com (mailout2.samsung.com. [203.254.224.25]) by gmr-mx.google.com with ESMTP id gl10si2211761pac.2.2013.04.01.02.45.49; Mon, 01 Apr 2013 02:45:49 -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 epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MKK00M1HLQ34RZ0@mailout2.samsung.com> for rtc-linux@googlegroups.com; Mon, 01 Apr 2013 18:45:48 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.51]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 01.11.05174.C4759515; Mon, 01 Apr 2013 18:45:48 +0900 (KST) X-AuditID: cbfee68f-b7f4a6d000001436-68-5159574c60c6 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 61.37.13494.C4759515; Mon, 01 Apr 2013 18:45:48 +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 <0MKK00BR1LSBNO20@mmp1.samsung.com>; Mon, 01 Apr 2013 18:45:47 +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 11/27] rtc: rtc-m41t80: use devm_*() functions Date: Mon, 01 Apr 2013 18:45:47 +0900 Message-id: <001601ce2ebd$b00ea710$102bf530$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac4uvSmu8Ej3RSKpRZmzfFm2iz9KEwAAHykg X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKIsWRmVeSWpSXmKPExsVy+t8zY12f8MhAg72LxSyWXLzKbjFn/Ro2 i8sLL7FaXN41h81if2cHowOrx56JJ9k8Tsz4zeLRt2UVo8f0eT+ZPD5vkgtgjeKySUnNySxL LdK3S+DKOLvhLkvBB96Kp3+amBoYN3B3MXJySAiYSNxa3ckIYYtJXLi3nq2LkYtDSGAZo8S2 tcuYYIpuz3zHDpFYxCgxof0xlPOLUeLjk1awKjYBNYkvXw4DJTg4RAT0JdpaNEBqmAV6GSXO 9O5mB6kRErCV+HH2OzOIzSlgJ/Fm4TxGkHphIPv4CgkQk0VAVaLnCy+IyQtUffa1N0gxr4Cg xI/J91hAbGYBLYn1O48zQdjyEpvXvGUGKZcQUJd49FcXJCwiYCRx8tVFqBIRiX0v3jGCHCMh cI9d4sTuxawgCRYBAYlvkw+xQPTKSmw6wAzxraTEwRU3WCYwSsxCsnkWks2zkGyehWTFAkaW VYyiqQXJBcVJ6UXGesWJucWleel6yfm5mxghUdq/g/HuAetDjMlA6ycyS4km5wOjPK8k3tDY zMjC1MTU2Mjc0ow0YSVxXrUW60AhgfTEktTs1NSC1KL4otKc1OJDjEwcnFINjNInqhuuSafe dVM/pmTn3fj/wpOVbD7xtWdcyqeINJ29r5ko7jX5sPBdtv/vXOekpe/et9t5yS4+nztR7ycu Mthf7Fpy6Gilxc+Cib+nVF6Uc1K8c58zd8nb13MPiX92nbTz8os3c+4+LLnD/vtM2bQ1vFb1 WUGTK22UrNfkeW9nZlxpOkEsTFKJpTgj0VCLuag4EQB8uKRu6AIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrEKsWRmVeSWpSXmKPExsVy+t9jAV2f8MhAgws/BC2WXLzKbjFn/Ro2 i8sLL7FaXN41h81if2cHowOrx56JJ9k8Tsz4zeLRt2UVo8f0eT+ZPD5vkgtgjWpgtMlITUxJ LVJIzUvOT8nMS7dV8g6Od443NTMw1DW0tDBXUshLzE21VXLxCdB1y8wB2q6kUJaYUwoUCkgs LlbSt8M0ITTETdcCpjFC1zckCK7HyAANJKxjzDi74S5LwQfeiqd/mpgaGDdwdzFyckgImEjc nvmOHcIWk7hwbz1bFyMXh5DAIkaJCe2P2SGcX4wSH5+0MoFUsQmoSXz5chgowcEhIqAv0dai AVLDLNDLKHGmdzfYJCEBW4kfZ78zg9icAnYSbxbOYwSpFwayj6+QADFZBFQler7wgpi8QNVn X3uDFPMKCEr8mHyPBcRmFtCSWL/zOBOELS+xec1bZpByCQF1iUd/dUHCIgJGEidfXYQqEZHY 9+Id4wRGoVlIJs1CMmkWkkmzkLQsYGRZxSiaWpBcUJyUnmukV5yYW1yal66XnJ+7iRGcAp5J 72Bc1WBxiFGAg1GJhzfiQkSgEGtiWXFl7iFGCQ5mJRFen29AId6UxMqq1KL8+KLSnNTiQ4zJ QG9OZJYSTc4Hpqe8knhDYxMzI0sjMwsjE3Nz0oSVxHkPtloHCgmkJ5akZqemFqQWwWxh4uCU amBkv/lUbzZ3/mKVlvCuut08hyoLAvT/+oUcSo3p3R0ze4PJbGGD5gKZtlIm1vpvTPJtppnH VM/fFJuZquhYfibjw66fy78onLJRSJ1gGpP4a8bvKOsvi8SlF3ed1mT68lVzkeGLm2+S8r8c 2fVr53TphX+zDGT+lnxaJlw9fblbzUIXcS+xBUlKLMUZiYZazEXFiQDo7NRTRQMAAA== 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-m41t80.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c index b885bcd..89674b5 100644 --- a/drivers/rtc/rtc-m41t80.c +++ b/drivers/rtc/rtc-m41t80.c @@ -637,7 +637,8 @@ static int m41t80_probe(struct i2c_client *client, dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n"); - clientdata = kzalloc(sizeof(*clientdata), GFP_KERNEL); + clientdata = devm_kzalloc(&client->dev, sizeof(*clientdata), + GFP_KERNEL); if (!clientdata) { rc = -ENOMEM; goto exit; @@ -646,8 +647,8 @@ static int m41t80_probe(struct i2c_client *client, clientdata->features = id->driver_data; i2c_set_clientdata(client, clientdata); - rtc = rtc_device_register(client->name, &client->dev, - &m41t80_rtc_ops, THIS_MODULE); + rtc = devm_rtc_device_register(&client->dev, client->name, + &m41t80_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) { rc = PTR_ERR(rtc); rtc = NULL; @@ -718,26 +719,19 @@ ht_err: goto exit; exit: - if (rtc) - rtc_device_unregister(rtc); - kfree(clientdata); return rc; } static int m41t80_remove(struct i2c_client *client) { +#ifdef CONFIG_RTC_DRV_M41T80_WDT struct m41t80_data *clientdata = i2c_get_clientdata(client); - struct rtc_device *rtc = clientdata->rtc; -#ifdef CONFIG_RTC_DRV_M41T80_WDT if (clientdata->features & M41T80_FEATURE_HT) { misc_deregister(&wdt_dev); unregister_reboot_notifier(&wdt_notifier); } #endif - if (rtc) - rtc_device_unregister(rtc); - kfree(clientdata); return 0; }