From patchwork Tue Apr 2 06:24:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 232892 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-yh0-x237.google.com (mail-yh0-x237.google.com [IPv6:2607:f8b0:4002:c01::237]) (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 DC1242C00E1 for ; Tue, 2 Apr 2013 17:37:06 +1100 (EST) Received: by mail-yh0-f55.google.com with SMTP id 25sf34641yhr.20 for ; Mon, 01 Apr 2013 23:37:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references: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=A1E8pCMXW0S+Ea5uw/mkxFOjEKkkrSeFzOIdMuu8+/0=; b=sc3joVi7pSpn+s8/czA2uZSxm8Vi51xSLsLAgGu+Wt6vwHZMhrnRX7JzC58THkeaP5 GdfVWZ8O0r+O9C8IgWdfPZ/Jrvzigiltv/MqU95PXEZNfBZn56QZj/dYW4PVCdHCRKPZ Vsgrkx6+kz4poIPEUWnQX1d0jyT9UWRu0bAFNp9supAF1/IwCgOwRf/gOEw0YBbcslx7 7EqsuvimbhAjlwAR54Xk4LeBcPa9Gpny8aakh1hNR8kSKFEtedaJ+H46s2ORQz+bF1iK QfZ0TM4qRHFrJ93lE2gGRLzvi7ULE7pcwWrBX/8QchPpmbHor3bovrKMetcLYEV/94PZ /mOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state: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=A1E8pCMXW0S+Ea5uw/mkxFOjEKkkrSeFzOIdMuu8+/0=; b=EUs6qZvYxPbFJKiqsLQw+5Ah0NWKzK9COSRQvaPn3A7kEeI0l7Wqo5UINfqTUycNNg VzxdRpBAem90CfeymSqY1l69sT7EC2n7EnT0BpA+dmA2GpekC3ebUdTkBX9BeSYKygxF M1UTdwUZPc+oUA5DzL06j3Gt2EyJjHbsCgWzr7QeL39amHLksMg/tbg5vVYqCIwpwTAD HfkYNtLqA7jN2IXyoaHK/NA1rxmn7G9fdiCn2VIchSzfNRxWyp90ng729CrFtBtW/GQG yMx9cT3pYoltKmOW9rczJg4nnFZro6qy4r0CsdhbZ41JTuD1MsC3LxSAgwD/122zQb5w MHhg== X-Received: by 10.50.140.65 with SMTP id re1mr1082983igb.13.1364884623177; Mon, 01 Apr 2013 23:37:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.213.42 with SMTP id np10ls213977igc.32.gmail; Mon, 01 Apr 2013 23:37:02 -0700 (PDT) X-Received: by 10.67.1.131 with SMTP id bg3mr2470515pad.29.1364884622830; Mon, 01 Apr 2013 23:37:02 -0700 (PDT) Received: from mail-pd0-f178.google.com (mail-pd0-f178.google.com [209.85.192.178]) by gmr-mx.google.com with ESMTPS id yl6si73531pbc.2.2013.04.01.23.37.02 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Apr 2013 23:37:02 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.192.178 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.192.178; Received: by mail-pd0-f178.google.com with SMTP id w11so65260pde.37 for ; Mon, 01 Apr 2013 23:37:02 -0700 (PDT) X-Received: by 10.68.132.42 with SMTP id or10mr22242089pbb.127.1364884622683; Mon, 01 Apr 2013 23:37:02 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPS id fc8sm1020265pad.21.2013.04.01.23.36.56 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Apr 2013 23:37:02 -0700 (PDT) From: Sachin Kamat To: rtc-linux@googlegroups.com Cc: a.zummo@towertech.it, akpm@linux-foundation.org, sachin.kamat@linaro.org, Hans-Christian Egtvedt Subject: [rtc-linux] [PATCH 2/8] drivers/rtc/rtc-at32ap700x.c: Use devm_* APIs Date: Tue, 2 Apr 2013 11:54:49 +0530 Message-Id: <1364883895-20865-2-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1364883895-20865-1-git-send-email-sachin.kamat@linaro.org> References: <1364883895-20865-1-git-send-email-sachin.kamat@linaro.org> X-Gm-Message-State: ALoCoQlJj6lT+tRD4Le+2NQZ2NpM+q9y3GdBXvD3q/q4822DBKpKHwiZxHrlDbWf3lWOLyu8c5VN X-Original-Sender: sachin.kamat@linaro.org X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 209.85.192.178 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org 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: , devm_* functions are device managed and make cleanup code simpler. Signed-off-by: Sachin Kamat Cc: Hans-Christian Egtvedt --- drivers/rtc/rtc-at32ap700x.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/drivers/rtc/rtc-at32ap700x.c b/drivers/rtc/rtc-at32ap700x.c index 619c887..f47fbb5 100644 --- a/drivers/rtc/rtc-at32ap700x.c +++ b/drivers/rtc/rtc-at32ap700x.c @@ -202,7 +202,8 @@ static int __init at32_rtc_probe(struct platform_device *pdev) int irq; int ret; - rtc = kzalloc(sizeof(struct rtc_at32ap700x), GFP_KERNEL); + rtc = devm_kzalloc(&pdev->dev, sizeof(struct rtc_at32ap700x), + GFP_KERNEL); if (!rtc) { dev_dbg(&pdev->dev, "out of memory\n"); return -ENOMEM; @@ -223,7 +224,7 @@ static int __init at32_rtc_probe(struct platform_device *pdev) } rtc->irq = irq; - rtc->regs = ioremap(regs->start, resource_size(regs)); + rtc->regs = devm_ioremap(&pdev->dev, regs->start, resource_size(regs)); if (!rtc->regs) { ret = -ENOMEM; dev_dbg(&pdev->dev, "could not map I/O memory\n"); @@ -244,20 +245,21 @@ static int __init at32_rtc_probe(struct platform_device *pdev) | RTC_BIT(CTRL_EN)); } - ret = request_irq(irq, at32_rtc_interrupt, IRQF_SHARED, "rtc", rtc); + ret = devm_request_irq(&pdev->dev, irq, at32_rtc_interrupt, IRQF_SHARED, + "rtc", rtc); if (ret) { dev_dbg(&pdev->dev, "could not request irq %d\n", irq); - goto out_iounmap; + goto out; } platform_set_drvdata(pdev, rtc); - rtc->rtc = rtc_device_register(pdev->name, &pdev->dev, + rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name, &at32_rtc_ops, THIS_MODULE); if (IS_ERR(rtc->rtc)) { dev_dbg(&pdev->dev, "could not register rtc device\n"); ret = PTR_ERR(rtc->rtc); - goto out_free_irq; + goto out; } device_init_wakeup(&pdev->dev, 1); @@ -267,26 +269,15 @@ static int __init at32_rtc_probe(struct platform_device *pdev) return 0; -out_free_irq: - platform_set_drvdata(pdev, NULL); - free_irq(irq, rtc); -out_iounmap: - iounmap(rtc->regs); out: - kfree(rtc); + platform_set_drvdata(pdev, NULL); return ret; } static int __exit at32_rtc_remove(struct platform_device *pdev) { - struct rtc_at32ap700x *rtc = platform_get_drvdata(pdev); - device_init_wakeup(&pdev->dev, 0); - free_irq(rtc->irq, rtc); - iounmap(rtc->regs); - rtc_device_unregister(rtc->rtc); - kfree(rtc); platform_set_drvdata(pdev, NULL); return 0;