From patchwork Mon Apr 1 09:44:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 232698 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-ob0-x23f.google.com (mail-ob0-x23f.google.com [IPv6:2607:f8b0:4003:c01::23f]) (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 A1FA92C00C4 for ; Mon, 1 Apr 2013 20:45:04 +1100 (EST) Received: by mail-ob0-f191.google.com with SMTP id dn14sf898943obc.18 for ; Mon, 01 Apr 2013 02:45:02 -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=0S9x8Ol3lAapTMUnV9D57Tkc53cx8en9TywJqOI9V2w=; b=ClYBf9YIZnwLoN7UCorqWwQ8z4TZVGd/Yv+bcvukKNuYc0Tsipq05f1PSTKhWkguwq +T++XihnTpYgTgviUaJDgUQvnCZivjZEHHyLdBq2YxIKSCdA8FBD9wN3pQhQ4gWkA2fa DCbj2Y84KOwnDJx7MJTwl/wpTJbFDeKYG0rHHgFS6YpjmNM1Hesu6yef+Hk+bNDaZRts HgccwUJBwgGFEzTxvffpzPg4pe+VAejnfpHQ9nQzzLeOrFliRK23aSi/zwizf14qLj2E q8oRf5K433CDJuW441JeNM1RO4HjR++FXyeU2acLyuKj30p43gJ1cE83yVCKS/6IfAJV 9Zcg== X-Received: by 10.50.150.166 with SMTP id uj6mr511198igb.1.1364809502086; Mon, 01 Apr 2013 02:45:02 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.189.232 with SMTP id gl8ls897643igc.40.gmail; Mon, 01 Apr 2013 02:45:01 -0700 (PDT) X-Received: by 10.66.227.72 with SMTP id ry8mr2297142pac.30.1364809501876; Mon, 01 Apr 2013 02:45:01 -0700 (PDT) Received: from mailout3.samsung.com (mailout3.samsung.com. [203.254.224.33]) by gmr-mx.google.com with ESMTP id ty9si2153037pbc.0.2013.04.01.02.45.01; Mon, 01 Apr 2013 02:45:01 -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 epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MKK0065BLQ87BZ0@mailout3.samsung.com> for rtc-linux@googlegroups.com; Mon, 01 Apr 2013 18:44:32 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.51]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 82.98.07735.FF659515; Mon, 01 Apr 2013 18:44:31 +0900 (KST) X-AuditID: cbfee68e-b7f946d000001e37-f4-515956ffca98 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 7F.E3.17838.FF659515; Mon, 01 Apr 2013 18:44:31 +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 <0MKK00BFJLQ7NO20@mmp1.samsung.com>; Mon, 01 Apr 2013 18:44:31 +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 07/27] rtc: rtc-ds1390: use devm_*() functions Date: Mon, 01 Apr 2013 18:44:31 +0900 Message-id: <001201ce2ebd$82ac7540$88055fc0$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac4uvSmu8Ej3RSKpRZmzfFm2iz9KEwAAE4fQ X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBIsWRmVeSWpSXmKPExsVy+t8zY93/YZGBBk9mWFosuXiV3WLO+jVs FpcXXmK1uLxrDpvF/s4ORgdWjz0TT7J5nJjxm8Wjb8sqRo/p834yeXzeJBfAGsVlk5Kak1mW WqRvl8CVMfXqZpaCaTwVj9rPsDUwfuPsYuTkkBAwkdja1skIYYtJXLi3nq2LkYtDSGAZo8Tq zm52mKKzm9ayQCQWMUr8mr+HGcL5xShx9OchsHY2ATWJL18OA3VwcIgI6Eu0tWiA1DAL9DJK nOndDTZJSMBW4sfZ78wgNqeAncSbhfPAeoWB7HPT97CA2CwCqhIXll9hArF5geqfffwEZQtK /Jh8D6yGWUBLYv3O40wQtrzE5jVvmUH2SgioSzz6qwsSFhEwktjRu5oRokREYt+Ld4wg90gI 3GOXePN3GSvELgGJb5MPsUD0ykpsOsAM8bCkxMEVN1gmMErMQrJ5FpLNs5BsnoVkxQJGllWM oqkFyQXFSelFRnrFibnFpXnpesn5uZsYIbHat4Px5gHrQ4zJQOsnMkuJJucDYz2vJN7Q2MzI wtTE1NjI3NKMNGElcV61FutAIYH0xJLU7NTUgtSi+KLSnNTiQ4xMHJxSDYyKASdvsjYGLl9g G913OeRLvYzVJyu7ifE3vqvrF6Xb2O18Wpl8betNzy5G+z2+/Tt2CFYfkWpJrPJslOypPnZ3 Sb8Dy+IPkhv3buLXuT/Hg1FWwKusTvnh2/MVdrmsBsbLXZO5M9ZprXMqEKgV4NxyeZbuC0Eu 38ePbF21fu++2MDbuHWmgxJLcUaioRZzUXEiABGXt9nrAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKKsWRmVeSWpSXmKPExsVy+t9jAd3/YZGBBkuvmlgsuXiV3WLO+jVs FpcXXmK1uLxrDpvF/s4ORgdWjz0TT7J5nJjxm8Wjb8sqRo/p834yeXzeJBfAGtXAaJORmpiS WqSQmpecn5KZl26r5B0c7xxvamZgqGtoaWGupJCXmJtqq+TiE6DrlpkDtF1JoSwxpxQoFJBY XKykb4dpQmiIm64FTGOErm9IEFyPkQEaSFjHmDH16maWgmk8FY/az7A1MH7j7GLk5JAQMJE4 u2ktC4QtJnHh3nq2LkYuDiGBRYwSv+bvYYZwfjFKHP15iBGkik1ATeLLl8PsXYwcHCIC+hJt LRogNcwCvYwSZ3p3s4PUCAnYSvw4+50ZxOYUsJN4s3AeWK8wkH1u+h6wbSwCqhIXll9hArF5 geqfffwEZQtK/Jh8D6yGWUBLYv3O40wQtrzE5jVvmUH2SgioSzz6qwsSFhEwktjRu5oRokRE Yt+Ld4wTGIVmIZk0C8mkWUgmzULSsoCRZRWjaGpBckFxUnquoV5xYm5xaV66XnJ+7iZGcCJ4 JrWDcWWDxSFGAQ5GJR7eiAsRgUKsiWXFlbmHGCU4mJVEeH2+AYV4UxIrq1KL8uOLSnNSiw8x JgM9OpFZSjQ5H5ik8kriDY1NzIwsjcwsjEzMzUkTVhLnPdBqHSgkkJ5YkpqdmlqQWgSzhYmD U6qBUUKVyy8g36fvc0l1+dQL51Uv8PPPuTBbZvKEmp07D5Suv5ceoPVPwfhb0o695e02cTWH 3lz6ZSF0ijXgSLybWk7sp6q1J6ev8HCV2a5yVffeuYMTjQ5KrAtJOlCRcb5g64HDQp8esMeH HJ3B4HL9Ca+ItEjaieqCStU22QPHA0TvT9bv/eY2TYmlOCPRUIu5qDgRAPcDDM5IAwAA 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-ds1390.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/rtc/rtc-ds1390.c b/drivers/rtc/rtc-ds1390.c index f994257..33e51c6 100644 --- a/drivers/rtc/rtc-ds1390.c +++ b/drivers/rtc/rtc-ds1390.c @@ -131,7 +131,7 @@ static int ds1390_probe(struct spi_device *spi) spi->bits_per_word = 8; spi_setup(spi); - chip = kzalloc(sizeof *chip, GFP_KERNEL); + chip = devm_kzalloc(&spi->dev, sizeof(*chip), GFP_KERNEL); if (!chip) { dev_err(&spi->dev, "unable to allocate device memory\n"); return -ENOMEM; @@ -141,16 +141,14 @@ static int ds1390_probe(struct spi_device *spi) res = ds1390_get_reg(&spi->dev, DS1390_REG_SECONDS, &tmp); if (res != 0) { dev_err(&spi->dev, "unable to read device\n"); - kfree(chip); return res; } - chip->rtc = rtc_device_register("ds1390", - &spi->dev, &ds1390_rtc_ops, THIS_MODULE); + chip->rtc = devm_rtc_device_register(&spi->dev, "ds1390", + &ds1390_rtc_ops, THIS_MODULE); if (IS_ERR(chip->rtc)) { dev_err(&spi->dev, "unable to register device\n"); res = PTR_ERR(chip->rtc); - kfree(chip); } return res; @@ -158,11 +156,6 @@ static int ds1390_probe(struct spi_device *spi) static int ds1390_remove(struct spi_device *spi) { - struct ds1390 *chip = spi_get_drvdata(spi); - - rtc_device_unregister(chip->rtc); - kfree(chip); - return 0; }