From patchwork Sun Oct 28 09:47:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devendra Naga X-Patchwork-Id: 194669 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-gh0-f184.google.com (mail-gh0-f184.google.com [209.85.160.184]) (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 EA5842C008D for ; Sun, 28 Oct 2012 20:47:30 +1100 (EST) Received: by mail-gh0-f184.google.com with SMTP id f11sf2571786ghb.11 for ; Sun, 28 Oct 2012 02:47:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:x-beenthere:received-spf:from:to:cc:subject:date :message-id:x-mailer: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; bh=3mfuvrDreZ5DTRvOXYoDGt4SLkyDBTlydHZ/rzfyNHs=; b=Hno0Zhs6jx1feACEiL/UaqDBGTA57E2XojVR5JPt4H7sevfvL42dsWoUiOkSUl5Nlr tpe9rd0uXmN7wu+eew+jKYGxcSyirgWudtt0bLk4txhTL/IrCoyVS2iN7vm6kxehknLM XEtpxa9W8k8mXudAIf7C9vnelTzhaEsic3maHTRHpk/m4G8dIS+H0TZpLqXdG7uuLBUm orDDt25c/OPWzIxuiHsFTHqEHF5G12rGtV31iBxYFkG80zWL+sk88eFkwjsrE/V8cELh EAxHJ8pl1w1Z+DBUZhd6d9rB/Vm4iyjwCWDUuH7Z3SL29dWnCZDNU9ZOY09iKx4+IHZJ 2DAg== Received: by 10.68.230.33 with SMTP id sv1mr8470463pbc.18.1351417647364; Sun, 28 Oct 2012 02:47:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.68.212.6 with SMTP id ng6ls21429188pbc.4.gmail; Sun, 28 Oct 2012 02:47:26 -0700 (PDT) Received: by 10.66.73.226 with SMTP id o2mr8178734pav.12.1351417646981; Sun, 28 Oct 2012 02:47:26 -0700 (PDT) Received: by 10.66.73.226 with SMTP id o2mr8178733pav.12.1351417646970; Sun, 28 Oct 2012 02:47:26 -0700 (PDT) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by gmr-mx.google.com with ESMTPS id js4si1231572pbb.2.2012.10.28.02.47.26 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 28 Oct 2012 02:47:26 -0700 (PDT) Received-SPF: pass (google.com: domain of devendra.aaru@gmail.com designates 209.85.160.50 as permitted sender) client-ip=209.85.160.50; Received: by mail-pb0-f50.google.com with SMTP id md4so3306165pbc.9 for ; Sun, 28 Oct 2012 02:47:26 -0700 (PDT) Received: by 10.68.230.234 with SMTP id tb10mr83592816pbc.71.1351417646877; Sun, 28 Oct 2012 02:47:26 -0700 (PDT) Received: from localhost.localdomain ([122.172.20.91]) by mx.google.com with ESMTPS id yi9sm4110890pbc.39.2012.10.28.02.47.22 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 28 Oct 2012 02:47:26 -0700 (PDT) From: Devendra Naga To: Andrew Morton , Alessandro Zummo , rtc-linux@googlegroups.com Cc: Devendra Naga , Alexey Charkov , Tony Prisk Subject: [rtc-linux] [PATCH] rtc: rtc-vt8500: convert to use devm_kzalloc Date: Sun, 28 Oct 2012 05:47:13 -0400 Message-Id: <1351417633-14795-1-git-send-email-devendra.aaru@gmail.com> X-Mailer: git-send-email 1.7.10.4 X-Original-Sender: devendra.aaru@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of devendra.aaru@gmail.com designates 209.85.160.50 as permitted sender) smtp.mail=devendra.aaru@gmail.com; dkim=pass header.i=@gmail.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: , replace the kzalloc and kfree calls with the devm_kzalloc. Cc: Alessandro Zummo Cc: Alexey Charkov Cc: Tony Prisk Signed-off-by: Devendra Naga Acked-by: Tony Prisk --- drivers/rtc/rtc-vt8500.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/rtc/rtc-vt8500.c b/drivers/rtc/rtc-vt8500.c index 07bf193..14e2d8c 100644 --- a/drivers/rtc/rtc-vt8500.c +++ b/drivers/rtc/rtc-vt8500.c @@ -210,7 +210,8 @@ static int __devinit vt8500_rtc_probe(struct platform_device *pdev) struct vt8500_rtc *vt8500_rtc; int ret; - vt8500_rtc = kzalloc(sizeof(struct vt8500_rtc), GFP_KERNEL); + vt8500_rtc = devm_kzalloc(&pdev->dev, + sizeof(struct vt8500_rtc), GFP_KERNEL); if (!vt8500_rtc) return -ENOMEM; @@ -220,15 +221,13 @@ static int __devinit vt8500_rtc_probe(struct platform_device *pdev) vt8500_rtc->res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!vt8500_rtc->res) { dev_err(&pdev->dev, "No I/O memory resource defined\n"); - ret = -ENXIO; - goto err_free; + return -ENXIO; } vt8500_rtc->irq_alarm = platform_get_irq(pdev, 0); if (vt8500_rtc->irq_alarm < 0) { dev_err(&pdev->dev, "No alarm IRQ resource defined\n"); - ret = -ENXIO; - goto err_free; + return -ENXIO; } vt8500_rtc->res = request_mem_region(vt8500_rtc->res->start, @@ -236,8 +235,7 @@ static int __devinit vt8500_rtc_probe(struct platform_device *pdev) "vt8500-rtc"); if (vt8500_rtc->res == NULL) { dev_err(&pdev->dev, "failed to request I/O memory\n"); - ret = -EBUSY; - goto err_free; + return -EBUSY; } vt8500_rtc->regbase = ioremap(vt8500_rtc->res->start, @@ -278,8 +276,6 @@ err_unmap: err_release: release_mem_region(vt8500_rtc->res->start, resource_size(vt8500_rtc->res)); -err_free: - kfree(vt8500_rtc); return ret; } @@ -297,7 +293,6 @@ static int __devexit vt8500_rtc_remove(struct platform_device *pdev) release_mem_region(vt8500_rtc->res->start, resource_size(vt8500_rtc->res)); - kfree(vt8500_rtc); platform_set_drvdata(pdev, NULL); return 0;