From patchwork Mon Apr 1 09:49:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 232713 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-ye0-f183.google.com (mail-ye0-f183.google.com [209.85.213.183]) (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 E3F492C00C4 for ; Mon, 1 Apr 2013 20:49:21 +1100 (EST) Received: by mail-ye0-f183.google.com with SMTP id q9sf916799yen.0 for ; Mon, 01 Apr 2013 02:49:19 -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=N1leB4hXwGLJqa7Q8Lhqy7VfbnJWV5pWKVI3iCmeokc=; b=DIjf4rlKqbTd4ZoR/5pKMOhOB1/zlFxutugbgAESKrgxHCIUrl7zZobV4V8VufBsCd 7x7qqAKfcocGoqaK9mJeb6Jsy3cXKr0mhIYSSgCCVoEUUjqK9P8v6RoDl12eZ0Q/mQbr gpOE3yBQjKqh7Z9saSTC1w10meuHzFf3KUWmn3NwbQGmi2xjuEhFz2vrMCTB3ssj8aC7 L8Q6W05g1dCwEyrVMoc10PE5s8JXeSDNFwjVjoPPnz9rD1D5uhUJiwmVj0/vqKGfwPme 8djC74atb1GD0KchU+ggA7HZIeYM6nKoIdnBB757K5MQSHQSB899gARyGT91Q5YgRi9a /dDw== X-Received: by 10.50.217.225 with SMTP id pb1mr799835igc.5.1364809759521; Mon, 01 Apr 2013 02:49:19 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.208.72 with SMTP id mc8ls890851igc.29.gmail; Mon, 01 Apr 2013 02:49:19 -0700 (PDT) X-Received: by 10.66.163.8 with SMTP id ye8mr2104113pab.23.1364809759322; Mon, 01 Apr 2013 02:49:19 -0700 (PDT) Received: from mailout4.samsung.com (mailout4.samsung.com. [203.254.224.34]) by gmr-mx.google.com with ESMTP id rs16si2215226pac.1.2013.04.01.02.49.19; Mon, 01 Apr 2013 02:49:19 -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 epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MKK000S3LXY24X0@mailout4.samsung.com> for rtc-linux@googlegroups.com; Mon, 01 Apr 2013 18:49:18 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.47]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id B3.67.02019.E1859515; Mon, 01 Apr 2013 18:49:18 +0900 (KST) X-AuditID: cbfee690-b7f656d0000007e3-f4-5159581e0861 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 89.38.13494.E1859515; Mon, 01 Apr 2013 18:49:18 +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 <0MKK00BQ7LY52250@mmp1.samsung.com>; Mon, 01 Apr 2013 18:49:17 +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 22/27] rtc: rtc-rs5c348: use devm_*() functions Date: Mon, 01 Apr 2013 18:49:17 +0900 Message-id: <002101ce2ebe$2d2fe2e0$878fa8a0$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac4uvSmu8Ej3RSKpRZmzfFm2iz9KEwAAPjqA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGIsWRmVeSWpSXmKPExsVy+t8zfV25iMhAgxOnRC2WXLzKbjFn/Ro2 i8sLL7FaXN41h81if2cHowOrx56JJ9k8Tsz4zeLRt2UVo8f0eT+ZPD5vkgtgjeKySUnNySxL LdK3S+DKWDL/EnvBfu6KP22/GRsYt3F2MXJySAiYSMw9co0RwhaTuHBvPVsXIxeHkMAyRomP +96xwhQtvrqaGSKxiFFiYs9/JpCEkMAvRomfra4gNpuAmsSXL4fZuxg5OEQE9CXaWjRA6pkF ehklzvTuZoeot5X4cfY7M4jNKWAn8WbhPEaQemEBe4nmL7UgYRYBVYn7n5aDjecFKm85sJ0F whaU+DH5HpjNLKAlsX7ncSYIW15i85q3zCBjJATUJR791QUJiwgYSZy/vZQVokREYt+Ld4wg 50gI3GOX6P+znwVil4DEt8mHWCB6ZSU2HWCGeFdS4uCKGywTGCVmIdk8C8nmWUg2z0KyYgEj yypG0dSC5ILipPQiE73ixNzi0rx0veT83E2MkDidsIPx3gHrQ4zJQOsnMkuJJucD4zyvJN7Q 2MzIwtTE1NjI3NKMNGElcV71FutAIYH0xJLU7NTUgtSi+KLSnNTiQ4xMHJxSDYxy5ReyOU8s CEppmH780csDhwWUfAuiNNXV5nDd6oy1OORpvPz4K35z08LjPi+yvQWfTe8QuBfxyv+hDdMD g3uzTihtS/L4/sjtTi/X690rej6cFc5KNd0Z7H9tNo8Z1/s3E/lm7Em5OFfA8LVd0Im++h8J ttYBlwJPHZqoVeD5MSprw/HCP7eVWIozEg21mIuKEwFisliw6QIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMKsWRmVeSWpSXmKPExsVy+t9jAV25iMhAg72rBS2WXLzKbjFn/Ro2 i8sLL7FaXN41h81if2cHowOrx56JJ9k8Tsz4zeLRt2UVo8f0eT+ZPD5vkgtgjWpgtMlITUxJ LVJIzUvOT8nMS7dV8g6Od443NTMw1DW0tDBXUshLzE21VXLxCdB1y8wB2q6kUJaYUwoUCkgs LlbSt8M0ITTETdcCpjFC1zckCK7HyAANJKxjzFgy/xJ7wX7uij9tvxkbGLdxdjFyckgImEgs vrqaGcIWk7hwbz1bFyMXh5DAIkaJiT3/mUASQgK/GCV+trqC2GwCahJfvhxm72Lk4BAR0Jdo a9EAqWcW6GWUONO7mx2i3lbix9nvYEM5Bewk3iycxwhSLyxgL9H8pRYkzCKgKnH/03Kw8bxA 5S0HtrNA2IISPybfA7OZBbQk1u88zgRhy0tsXvOWGWSMhIC6xKO/uiBhEQEjifO3l7JClIhI 7HvxjnECo9AsJJNmIZk0C8mkWUhaFjCyrGIUTS1ILihOSs810itOzC0uzUvXS87P3cQITgLP pHcwrmqwOMQowMGoxMMbcSEiUIg1say4MvcQowQHs5IIr883oBBvSmJlVWpRfnxRaU5q8SHG ZKBHJzJLiSbnAxNUXkm8obGJmZGlkZmFkYm5OWnCSuK8B1utA4UE0hNLUrNTUwtSi2C2MHFw SjUwxjX4nT5W/0Te0sgqudKxZWviWRk38dXP9t24o39MtNBg75spBo25LKUeT1YqhaxLyFv/ 6W0n14T8o/si+/dsn/Dya9v9m7r7Fh4J/FBo4ftYrsBrz9UTFT1ccsHxmaUBP9NWS2rW8W84 dT3VetuS3UmXT3gW99z55uTMfk/sm3/l1NWnvnrcVGIpzkg01GIuKk4EAPHY1SBGAwAA 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-rs5c348.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/rtc/rtc-rs5c348.c b/drivers/rtc/rtc-rs5c348.c index 72ef10b..2c37df3 100644 --- a/drivers/rtc/rtc-rs5c348.c +++ b/drivers/rtc/rtc-rs5c348.c @@ -158,7 +158,8 @@ static int rs5c348_probe(struct spi_device *spi) struct rtc_device *rtc; struct rs5c348_plat_data *pdata; - pdata = kzalloc(sizeof(struct rs5c348_plat_data), GFP_KERNEL); + pdata = devm_kzalloc(&spi->dev, sizeof(struct rs5c348_plat_data), + GFP_KERNEL); if (!pdata) return -ENOMEM; spi->dev.platform_data = pdata; @@ -202,7 +203,7 @@ static int rs5c348_probe(struct spi_device *spi) if (ret & RS5C348_BIT_24H) pdata->rtc_24h = 1; - rtc = rtc_device_register(rs5c348_driver.driver.name, &spi->dev, + rtc = devm_rtc_device_register(&spi->dev, rs5c348_driver.driver.name, &rs5c348_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) { @@ -214,18 +215,11 @@ static int rs5c348_probe(struct spi_device *spi) return 0; kfree_exit: - kfree(pdata); return ret; } static int rs5c348_remove(struct spi_device *spi) { - struct rs5c348_plat_data *pdata = spi->dev.platform_data; - struct rtc_device *rtc = pdata->rtc; - - if (rtc) - rtc_device_unregister(rtc); - kfree(pdata); return 0; }