From patchwork Tue Apr 2 06:24:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 232896 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-gh0-f188.google.com (mail-gh0-f188.google.com [209.85.160.188]) (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 C34922C00E1 for ; Tue, 2 Apr 2013 17:37:42 +1100 (EST) Received: by mail-gh0-f188.google.com with SMTP id r14sf34349ghr.5 for ; Mon, 01 Apr 2013 23:37:40 -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=n3rhEP/Acv400hIITewG2SGlj1jXfqCW+vw2tyd1Zbk=; b=KH4r+wWFIYV5nQpErAJp+BYSU79hz7G7BSxDbWjsw4nRKdY8hJfi+wZm5z3WggRbLv o8lint0eYLLey36zcDVKygzU5gsOjcw/varuJGgPycUpU0ZtlNaotzqQk+mbUmHQZQFd lwJQ00XS+Lv2LiJ9vdtncsx2p/dhEfqpJN56Q7rdYXLxyiBAK8Niracs6vWEAKlrPw0K rDVm+tca3qQTJqwZoJQgoJQqTEb/XXrxLTFf3xtUre6rOqqm8iGzZ9LRNRQivaFEp2Tj G/t7YUFD49GpwOKwCcuZD/6/lG9hDRutc35qIof+KUMxyOWHLGctBlMLju9jl/uY7hLN VamQ== 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=n3rhEP/Acv400hIITewG2SGlj1jXfqCW+vw2tyd1Zbk=; b=D0RrYYAxXkj8KANCp4F+eMh1LNDYqWXZ6OO/E08FpFLdNSAxbtw9nGsq8wdLItdIne dyDBkq3+R8OxOIbBIvYfpvc0oQM2jniEd96xmyZUjjtxZQ0s4tQzYKjQCH3eWZqo98AP cnQpclAYGKFvEG5GRMu1FFU9BuOWjDtBQmTtr1KLRgU2xEvgKzocnAD7n3NfpYx7lUDd 3ZjEzRYTIwfL0jWhH7ptKDUwXM82ThSlfNyzKpc4yUejCLuOl80mjnf7VNrgj0WRhORw 1v3nEq2NJmezStBxtSYS9TRUA1rmdTpCGp1TYk+ZPODik63189bO6d7tforYptHwuIox +djg== X-Received: by 10.50.131.232 with SMTP id op8mr954887igb.5.1364884660089; Mon, 01 Apr 2013 23:37:40 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.237.38 with SMTP id uz6ls194525igc.22.gmail; Mon, 01 Apr 2013 23:37:39 -0700 (PDT) X-Received: by 10.66.12.135 with SMTP id y7mr2726102pab.7.1364884659618; Mon, 01 Apr 2013 23:37:39 -0700 (PDT) Received: from mail-pb0-f47.google.com (mail-pb0-f47.google.com [209.85.160.47]) by gmr-mx.google.com with ESMTPS id yl6si73119pbc.2.2013.04.01.23.37.39 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Apr 2013 23:37:39 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.47 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.160.47; Received: by mail-pb0-f47.google.com with SMTP id rq13so66202pbb.34 for ; Mon, 01 Apr 2013 23:37:39 -0700 (PDT) X-Received: by 10.66.255.41 with SMTP id an9mr23003723pad.44.1364884659466; Mon, 01 Apr 2013 23:37:39 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPS id fc8sm1020265pad.21.2013.04.01.23.37.34 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Apr 2013 23:37:38 -0700 (PDT) From: Sachin Kamat To: rtc-linux@googlegroups.com Cc: a.zummo@towertech.it, akpm@linux-foundation.org, sachin.kamat@linaro.org, Thomas Bogendoerfer Subject: [rtc-linux] [PATCH 6/8] drivers/rtc/rtc-m48t35.c: Use devm_* APIs Date: Tue, 2 Apr 2013 11:54:53 +0530 Message-Id: <1364883895-20865-6-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: ALoCoQm3xkTtnsPj/DIsYm3RkprUNBXCMDLqjvKkrUnozgtO/M7lMmc4sSrjJwfP2hllcEsKsW7j X-Original-Sender: sachin.kamat@linaro.org X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 209.85.160.47 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: Thomas Bogendoerfer --- drivers/rtc/rtc-m48t35.c | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/drivers/rtc/rtc-m48t35.c b/drivers/rtc/rtc-m48t35.c index 31c9190..3744424 100644 --- a/drivers/rtc/rtc-m48t35.c +++ b/drivers/rtc/rtc-m48t35.c @@ -145,12 +145,11 @@ static int m48t35_probe(struct platform_device *pdev) { struct resource *res; struct m48t35_priv *priv; - int ret = 0; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) return -ENODEV; - priv = kzalloc(sizeof(struct m48t35_priv), GFP_KERNEL); + priv = devm_kzalloc(&pdev->dev, sizeof(struct m48t35_priv), GFP_KERNEL); if (!priv) return -ENOMEM; @@ -160,50 +159,29 @@ static int m48t35_probe(struct platform_device *pdev) * conflicts are resolved */ #ifndef CONFIG_SGI_IP27 - if (!request_mem_region(res->start, priv->size, pdev->name)) { - ret = -EBUSY; - goto out; - } + if (!devm_request_mem_region(&pdev->dev, res->start, priv->size, + pdev->name)) + return -EBUSY; #endif priv->baseaddr = res->start; - priv->reg = ioremap(priv->baseaddr, priv->size); - if (!priv->reg) { - ret = -ENOMEM; - goto out; - } + priv->reg = devm_ioremap(&pdev->dev, priv->baseaddr, priv->size); + if (!priv->reg) + return -ENOMEM; spin_lock_init(&priv->lock); platform_set_drvdata(pdev, priv); - priv->rtc = rtc_device_register("m48t35", &pdev->dev, + priv->rtc = devm_rtc_device_register(&pdev->dev, "m48t35", &m48t35_ops, THIS_MODULE); - if (IS_ERR(priv->rtc)) { - ret = PTR_ERR(priv->rtc); - goto out; - } + if (IS_ERR(priv->rtc)) + return PTR_ERR(priv->rtc); return 0; - -out: - if (priv->reg) - iounmap(priv->reg); - if (priv->baseaddr) - release_mem_region(priv->baseaddr, priv->size); - kfree(priv); - return ret; } static int m48t35_remove(struct platform_device *pdev) { - struct m48t35_priv *priv = platform_get_drvdata(pdev); - - rtc_device_unregister(priv->rtc); - iounmap(priv->reg); -#ifndef CONFIG_SGI_IP27 - release_mem_region(priv->baseaddr, priv->size); -#endif - kfree(priv); return 0; }