From patchwork Mon Apr 1 09:44:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 232697 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-oa0-f55.google.com (mail-oa0-f55.google.com [209.85.219.55]) (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 5B9162C00C4 for ; Mon, 1 Apr 2013 20:44:55 +1100 (EST) Received: by mail-oa0-f55.google.com with SMTP id n12sf900883oag.20 for ; Mon, 01 Apr 2013 02:44: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=pOeRRNPeaIkXvsPLzjw3WJMPFR3D+dDohmeIdu7CU4E=; b=uh/+aKn4k/nuYxwnU4n+kPqYJbWqumKtEBM5Q12eFT129PODq/EVENnHxdTcPoNNdH wtO5CzoDo8VO6k7fQP/Wqvm568y4UmQaPvZ9EpfA+N37fL2Gr9PeLMqVxsL6FP8vfVZ/ xc/Eh9am2C+r9rw8MH0s0BLnAYErqI9u+8h3EOLKNk3da49+i1OdIEho4qoPFt5jB9DV BPRRDWkciWpfOpv4fZcUh5DsqFdHp2hB4VG6bb+jMETmqqnPWC0xlx8iwFDMkv2wKycC f0QaxOG+uFgzkSMSdpg4xxI4SinbevBfkm0PvIAD3nl7ozuhWtW10wZ5cNBHzK3GoXSS hOIw== X-Received: by 10.50.150.180 with SMTP id uj20mr797416igb.7.1364809492579; Mon, 01 Apr 2013 02:44:52 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.42.229 with SMTP id r5ls890278igl.27.canary; Mon, 01 Apr 2013 02:44:52 -0700 (PDT) X-Received: by 10.66.26.195 with SMTP id n3mr1260722pag.43.1364809492301; Mon, 01 Apr 2013 02:44:52 -0700 (PDT) Received: from mailout2.samsung.com (mailout2.samsung.com. [203.254.224.25]) by gmr-mx.google.com with ESMTP id gl10si2211527pac.2.2013.04.01.02.44.52; Mon, 01 Apr 2013 02:44:52 -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 epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MKK0085KLQRGS10@mailout2.samsung.com> for rtc-linux@googlegroups.com; Mon, 01 Apr 2013 18:44:51 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.51]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id B6.0F.12250.31759515; Mon, 01 Apr 2013 18:44:51 +0900 (KST) X-AuditID: cbfee691-b7f5f6d000002fda-34-51595713b06a Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 65.04.17838.21759515; Mon, 01 Apr 2013 18:44:51 +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 <0MKK00GNELQQD560@mmp2.samsung.com>; Mon, 01 Apr 2013 18:44:50 +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 08/27] rtc: rtc-ds2404: use devm_*() functions Date: Mon, 01 Apr 2013 18:44:50 +0900 Message-id: <001301ce2ebd$8e279b20$aa76d160$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac4uvSmu8Ej3RSKpRZmzfFm2iz9KEwAAFoQQ X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGIsWRmVeSWpSXmKPExsVy+t8zY13h8MhAg0ldXBZLLl5lt5izfg2b xeWFl1gtLu+aw2axv7OD0YHVY8/Ek2weJ2b8ZvHo27KK0WP6vJ9MHp83yQWwRnHZpKTmZJal FunbJXBlzJ79l7ngKnfF5i9nGBsYj3B2MXJySAiYSDRtn80IYYtJXLi3nq2LkYtDSGAZo8TD 11PZYYrOb7kFlZjOKNG6dQI7hPOLUWJx51GwKjYBNYkvXw4D2RwcIgL6Em0tGiA1zAK9jBJn eneD1QgJ2Er8OPudGcTmFLCTeLNwHthqYSD7/rUNLCC9LAKqEl/+qYGEeYHKHy7bywphC0r8 mHyPBcRmFtCSWL/zOBOELS+xec1bZpBWCQF1iUd/dUHCIgJGEjfmLGWEKBGR2PfiHdST99gl 5j4JALFZBAQkvk0+xALRKiux6QAzRImkxMEVN1gmMErMQrJ4FpLFs5AsnoVkwwJGllWMoqkF yQXFSelFpnrFibnFpXnpesn5uZsYIXE6cQfj/QPWhxiTgdZPZJYSTc4HxnleSbyhsZmRhamJ qbGRuaUZacJK4rzqLdaBQgLpiSWp2ampBalF8UWlOanFhxiZODilGhg7mBZPT7Mz3bZqh+sE 93+VM9W1tx58OM9Y/9it5n+cJQ63jX8eCH/Qb2mUc0rjP2NH7oP2yIMxedXfHVcq/47msX9S q1iyeM3ExDXXWup/Gl6cXlo+k/XAzgvnGY9kuHPpbTFf9c8nXP2VY+PLK/x5AQvb5gt//LPl VJ/fno+VZbm77kS+5T6pxFKckWioxVxUnAgAf//4LOkCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCKsWRmVeSWpSXmKPExsVy+t9jQV3h8MhAg/UXWC2WXLzKbjFn/Ro2 i8sLL7FaXN41h81if2cHowOrx56JJ9k8Tsz4zeLRt2UVo8f0eT+ZPD5vkgtgjWpgtMlITUxJ LVJIzUvOT8nMS7dV8g6Od443NTMw1DW0tDBXUshLzE21VXLxCdB1y8wB2q6kUJaYUwoUCkgs LlbSt8M0ITTETdcCpjFC1zckCK7HyAANJKxjzJg9+y9zwVXuis1fzjA2MB7h7GLk5JAQMJE4 v+UWG4QtJnHh3nogm4tDSGA6o0Tr1gnsEM4vRonFnUfZQarYBNQkvnw5DGRzcIgI6Eu0tWiA 1DAL9DJKnOndDVYjJGAr8ePsd2YQm1PATuLNwnmMILYwkH3/2gYWkF4WAVWJL//UQMK8QOUP l+1lhbAFJX5MvscCYjMLaEms33mcCcKWl9i85i0zSKuEgLrEo7+6IGERASOJG3OWMkKUiEjs e/GOcQKj0Cwkk2YhmTQLyaRZSFoWMLKsYhRNLUguKE5KzzXUK07MLS7NS9dLzs/dxAhOA8+k djCubLA4xCjAwajEwxtxISJQiDWxrLgy9xCjBAezkgivzzegEG9KYmVValF+fFFpTmrxIcZk oD8nMkuJJucDU1ReSbyhsYmZkaWRmYWRibk5acJK4rwHWq0DhQTSE0tSs1NTC1KLYLYwcXBK NTCG6r3f4+KcpXba8PQuF/VHyxJSz30WmbhN7WWh6bqoaTJTE2uUdOa8ElHQMKgNFhU2cDxx 5eQmtqVlnE+/h4cssDjG1Lxrh+S2yf5mH5Qz5gol/GtedffEjzcKnVu++q5teqHl1j5/UeAx jSrTAPcry//7fFc+KLEk+n1/ybLE3XOmbGvT7tRTYinOSDTUYi4qTgQAYK+A7kcDAAA= 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-ds2404.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/rtc/rtc-ds2404.c b/drivers/rtc/rtc-ds2404.c index b04fc42..2ca5a23 100644 --- a/drivers/rtc/rtc-ds2404.c +++ b/drivers/rtc/rtc-ds2404.c @@ -228,7 +228,7 @@ static int rtc_probe(struct platform_device *pdev) struct ds2404 *chip; int retval = -EBUSY; - chip = kzalloc(sizeof(struct ds2404), GFP_KERNEL); + chip = devm_kzalloc(&pdev->dev, sizeof(struct ds2404), GFP_KERNEL); if (!chip) return -ENOMEM; @@ -244,8 +244,8 @@ static int rtc_probe(struct platform_device *pdev) platform_set_drvdata(pdev, chip); - chip->rtc = rtc_device_register("ds2404", - &pdev->dev, &ds2404_rtc_ops, THIS_MODULE); + chip->rtc = devm_rtc_device_register(&pdev->dev, "ds2404", + &ds2404_rtc_ops, THIS_MODULE); if (IS_ERR(chip->rtc)) { retval = PTR_ERR(chip->rtc); goto err_io; @@ -257,20 +257,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 ds2404 *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; }