From patchwork Mon Apr 1 09:45:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 232699 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-pb0-f62.google.com (mail-pb0-f62.google.com [209.85.160.62]) (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 E4FBF2C010A for ; Mon, 1 Apr 2013 20:45:13 +1100 (EST) Received: by mail-pb0-f62.google.com with SMTP id jt11sf920349pbb.27 for ; Mon, 01 Apr 2013 02:45:12 -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=rkfCAP6DQbNE43N2TRgun7nG/lLoGJ3ggulgfb/Ea4o=; b=zWCXKUYPv5kmV6skC1fJmSKINxhvhOgZryZMahjYoZV9N4mN1/wyNUB1ORyOIgSYsj xCOgucMy5YA7KHpC3HxrVocSuouUVIWNAq4Uu6O3OeehsFJoQhXYC7YPD7FahLatjUPj 7dFJ0wvfQ6fKgVsmNVQp7X56FhtaPcBRFYevIsNk9RqjSv/im/acyVBF3uZD4g1VCAg1 N26cY0aejluXM3vLCW1NIoz9GzEc8dGIHsl+aWdUCeNtKZ3VSYdoUKQlTX6OQjfv5ueU PByMFws5QXDb3CcCQFfrGlHXEScGYBjrDOEPBcv75PgrkOsgixv44MVX+YMFqznzRVPH YDWQ== X-Received: by 10.50.5.197 with SMTP id u5mr824603igu.0.1364809512087; Mon, 01 Apr 2013 02:45:12 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.37.133 with SMTP id y5ls896377igj.42.gmail; Mon, 01 Apr 2013 02:45:11 -0700 (PDT) X-Received: by 10.66.8.69 with SMTP id p5mr2263153paa.46.1364809511848; Mon, 01 Apr 2013 02:45:11 -0700 (PDT) Received: from mailout1.samsung.com (mailout1.samsung.com. [203.254.224.24]) by gmr-mx.google.com with ESMTP id xb6si2214247pab.0.2013.04.01.02.45.11; Mon, 01 Apr 2013 02:45:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of jg1.han@samsung.com designates 203.254.224.24 as permitted sender) client-ip=203.254.224.24; Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MKK00LANLRAS7S0@mailout1.samsung.com> for rtc-linux@googlegroups.com; Mon, 01 Apr 2013 18:45:10 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.47]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 28.F5.02019.62759515; Mon, 01 Apr 2013 18:45:10 +0900 (KST) X-AuditID: cbfee690-b7f656d0000007e3-e3-515957267b9f Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id AB.07.13494.62759515; Mon, 01 Apr 2013 18:45:10 +0900 (KST) Received: from DOJG1HAN02 ([12.23.120.99]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MKK00GX0LRAT130@mmp2.samsung.com>; Mon, 01 Apr 2013 18:45: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 09/27] rtc: rtc-fm3130: use devm_*() functions Date: Mon, 01 Apr 2013 18:45:10 +0900 Message-id: <001401ce2ebd$99ed3780$cdc7a680$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac4uvSmu8Ej3RSKpRZmzfFm2iz9KEwAAGURA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBIsWRmVeSWpSXmKPExsVy+t8zfV218MhAg5tHLSyWXLzKbjFn/Ro2 i8sLL7FaXN41h81if2cHowOrx56JJ9k8Tsz4zeLRt2UVo8f0eT+ZPD5vkgtgjeKySUnNySxL LdK3S+DKmLv2G0vBK66Klf9XsDYwvuToYuTkkBAwkbj68S8zhC0mceHeerYuRi4OIYFljBKv juxkgynqevqHBSIxnVFiyo9eZgjnF6NE96FHjCBVbAJqEl++HGbvYuTgEBHQl2hr0QCpYRbo ZZQ407ubHaRGSMBW4sfZ72DrOAXsJN4snAfWKwxkH9s8jQXEZhFQlWg9+BrM5gWqP7DpGDuE LSjxY/I9sDizgJbE+p3HmSBseYnNa94yg+yVEFCXePRXFyQsImAksWD3BVaIEhGJfS/eMYLc IyFwj11iyrl+qF0CEt8mH2KB6JWV2HQAGhKSEgdX3GCZwCgxC8nmWUg2z0KyeRaSFQsYWVYx iqYWJBcUJ6UXmegVJ+YWl+al6yXn525ihMTqhB2M9w5YH2JMBlo/kVlKNDkfGOt5JfGGxmZG FqYmpsZG5pZmpAkrifOqt1gHCgmkJ5akZqemFqQWxReV5qQWH2Jk4uCUamBk+8zHz3Hc/5ah x8nPD67ynqkxEK97MFMk6L3v2ns/Hyn2r9zYEq94/qBhTPO6r9t8+06ad2w9+OE158I/2R/N Fls/7u196b+wZM0UAUb1c0eOVui+u222yPzmifXX/i63nLkrbRmz9Esjm8oI+5+OZfG/WVbc WBm2NfOmUNLzLHeT3byKOWqdSizFGYmGWsxFxYkA1XDywusCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKKsWRmVeSWpSXmKPExsVy+t9jQV218MhAg2vtJhZLLl5lt5izfg2b xeWFl1gtLu+aw2axv7OD0YHVY8/Ek2weJ2b8ZvHo27KK0WP6vJ9MHp83yQWwRjUw2mSkJqak Fimk5iXnp2TmpdsqeQfHO8ebmhkY6hpaWpgrKeQl5qbaKrn4BOi6ZeYAbVdSKEvMKQUKBSQW Fyvp22GaEBripmsB0xih6xsSBNdjZIAGEtYxZsxd+42l4BVXxcr/K1gbGF9ydDFyckgImEh0 Pf3DAmGLSVy4t56ti5GLQ0hgOqPElB+9zBDOL0aJ7kOPGEGq2ATUJL58OczexcjBISKgL9HW ogFSwyzQyyhxpnc3O0iNkICtxI+z35lBbE4BO4k3C+eB9QoD2cc2TwPbxiKgKtF68DWYzQtU f2DTMXYIW1Dix+R7YHFmAS2J9TuPM0HY8hKb17xlBtkrIaAu8eivLkhYRMBIYsHuC6wQJSIS +168Y5zAKDQLyaRZSCbNQjJpFpKWBYwsqxhFUwuSC4qT0nON9IoTc4tL89L1kvNzNzGCE8Ez 6R2MqxosDjEKcDAq8fBGXIgIFGJNLCuuzD3EKMHBrCTC6/MNKMSbklhZlVqUH19UmpNafIgx GejRicxSosn5wCSVVxJvaGxiZmRpZGZhZGJuTpqwkjjvwVbrQCGB9MSS1OzU1ILUIpgtTByc Ug2MzatnyNaXXw3W2KWU+kxmL1ed82HRXe9MKqvmVPz0c+uVP/OFx1vr3yJXg17XghALjciZ /8q6Cxze+Hu8UChxbzzw64nFhPPXsjP2f/Oqj3fpuP1c/sI/8z0B+t32U9xNzzrNdO+PMFs2 ezJfX+KXQxG63+2bkwXuz72254zQ+wvp9rcjnbOUWIozEg21mIuKEwG6trk9SAMAAA== 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.24 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-fm3130.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/rtc/rtc-fm3130.c b/drivers/rtc/rtc-fm3130.c index 4d4ad3f..2835fb6 100644 --- a/drivers/rtc/rtc-fm3130.c +++ b/drivers/rtc/rtc-fm3130.c @@ -358,7 +358,7 @@ static int fm3130_probe(struct i2c_client *client, I2C_FUNC_I2C | I2C_FUNC_SMBUS_WRITE_BYTE_DATA)) return -EIO; - fm3130 = kzalloc(sizeof(struct fm3130), GFP_KERNEL); + fm3130 = devm_kzalloc(&client->dev, sizeof(struct fm3130), GFP_KERNEL); if (!fm3130) return -ENOMEM; @@ -507,7 +507,7 @@ bad_clock: /* We won't bail out here because we just got invalid data. Time setting from u-boot doesn't work anyway */ - fm3130->rtc = rtc_device_register(client->name, &client->dev, + fm3130->rtc = devm_rtc_device_register(&client->dev, client->name, &fm3130_rtc_ops, THIS_MODULE); if (IS_ERR(fm3130->rtc)) { err = PTR_ERR(fm3130->rtc); @@ -517,16 +517,11 @@ bad_clock: } return 0; exit_free: - kfree(fm3130); return err; } static int fm3130_remove(struct i2c_client *client) { - struct fm3130 *fm3130 = i2c_get_clientdata(client); - - rtc_device_unregister(fm3130->rtc); - kfree(fm3130); return 0; }