From patchwork Tue Apr 2 06:24:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 232893 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-gg0-x239.google.com (mail-gg0-x239.google.com [IPv6:2607:f8b0:4002:c02::239]) (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 11DFB2C00D9 for ; Tue, 2 Apr 2013 17:37:18 +1100 (EST) Received: by mail-gg0-f185.google.com with SMTP id n2sf35419ggf.22 for ; Mon, 01 Apr 2013 23:37:16 -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=q4EV0OOFXUMeFrjnbDOIyNbGMpGh8uzxfQv/4hFMet8=; b=k/N1NBI2I9rMRmYr8zDboYBlj5trGDOmP83aCX6OH7sFfIW0eMah07epURZ5UR+Jfm /lFnyfrp/hFx++MN/Z6l5OvE2MOFoy8Kwe5YEidjFVcybj/bZ8bVJvcx0VZjBSa8FHj8 7EqKplIwT+MjdRsfTeBnf8gcqB6R+L4jK7fQIUYMWb5SxECBqP5vTm5MIhMfhYiyrsUi WQd8eAhcwD7zKxMIALPAgz/GhPd3DMAtSSTZOPfTdOWOTK5EhBl/NzuhEA2qIII9g0eK yCmV1cTDJtKfO15n6olRR/H7TWR19g8an5fw78q2Pko0O5dMjByyUmaBex1BiSAL/AOx MYxQ== 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=q4EV0OOFXUMeFrjnbDOIyNbGMpGh8uzxfQv/4hFMet8=; b=QDSqCfvkUReLmo//J736VP0VsMXTVmUvUk6jFNhpay3WOo18RGMrII8hetfbzegGLP hLN6IWYtC1bYmuHT86SxwDdXDu2Nl18aHlbm/4vQbRJo67lSvEAQrtb19KIplCEvv0kg WELmXWh+XH8nCIJMwu4GT2HpmuCn34L6859rTrkXfbku5/F9QdYjfqy/Ul0Bvk1okJgu WM+m4+TAJqffHhTHF3xjJ6/Xpds9GxbooCyAD1sq0tQ2N+hShhns4aVNhvXQgt7wux0x XNgImu5CK555oJkMRu8ooNyJ8VOtoluofJh3haqBjZ4Rel2mf6cuZNZhc80s1WBNfpuw 7G8Q== X-Received: by 10.50.5.197 with SMTP id u5mr1535717igu.0.1364884636327; Mon, 01 Apr 2013 23:37:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.159.133 with SMTP id xc5ls1544981igb.3.canary; Mon, 01 Apr 2013 23:37:15 -0700 (PDT) X-Received: by 10.66.12.135 with SMTP id y7mr2725912pab.7.1364884635881; Mon, 01 Apr 2013 23:37:15 -0700 (PDT) Received: from mail-pd0-f172.google.com (mail-pd0-f172.google.com [209.85.192.172]) by gmr-mx.google.com with ESMTPS id gl10si129629pac.2.2013.04.01.23.37.15 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Apr 2013 23:37:15 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.192.172 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.192.172; Received: by mail-pd0-f172.google.com with SMTP id 5so67143pdd.3 for ; Mon, 01 Apr 2013 23:37:15 -0700 (PDT) X-Received: by 10.68.104.1 with SMTP id ga1mr21969554pbb.182.1364884635729; Mon, 01 Apr 2013 23:37:15 -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.07 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Apr 2013 23:37:14 -0700 (PDT) From: Sachin Kamat To: rtc-linux@googlegroups.com Cc: a.zummo@towertech.it, akpm@linux-foundation.org, sachin.kamat@linaro.org, David Brownell Subject: [rtc-linux] [PATCH 3/8] drivers/rtc/rtc-ds1305.c: Use devm_* APIs Date: Tue, 2 Apr 2013 11:54:50 +0530 Message-Id: <1364883895-20865-3-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: ALoCoQl2jbT9231dZJsPQEMMe1slMVwfXkzfghFxAEgLdLcG/OfkTf4EtSRQD+kaXb9PkFISHi6n X-Original-Sender: sachin.kamat@linaro.org X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 209.85.192.172 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: David Brownell --- drivers/rtc/rtc-ds1305.c | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c index b05a6dc..bb5f13f 100644 --- a/drivers/rtc/rtc-ds1305.c +++ b/drivers/rtc/rtc-ds1305.c @@ -619,7 +619,7 @@ static int ds1305_probe(struct spi_device *spi) return -EINVAL; /* set up driver data */ - ds1305 = kzalloc(sizeof *ds1305, GFP_KERNEL); + ds1305 = devm_kzalloc(&spi->dev, sizeof(*ds1305), GFP_KERNEL); if (!ds1305) return -ENOMEM; ds1305->spi = spi; @@ -632,7 +632,7 @@ static int ds1305_probe(struct spi_device *spi) if (status < 0) { dev_dbg(&spi->dev, "can't %s, %d\n", "read", status); - goto fail0; + return status; } dev_dbg(&spi->dev, "ctrl %s: %3ph\n", "read", ds1305->ctrl); @@ -644,8 +644,7 @@ static int ds1305_probe(struct spi_device *spi) */ if ((ds1305->ctrl[0] & 0x38) != 0 || (ds1305->ctrl[1] & 0xfc) != 0) { dev_dbg(&spi->dev, "RTC chip is not present\n"); - status = -ENODEV; - goto fail0; + return -ENODEV; } if (ds1305->ctrl[2] == 0) dev_dbg(&spi->dev, "chip may not be present\n"); @@ -664,7 +663,7 @@ static int ds1305_probe(struct spi_device *spi) dev_dbg(&spi->dev, "clear WP --> %d\n", status); if (status < 0) - goto fail0; + return status; } /* on DS1305, maybe start oscillator; like most low power @@ -718,7 +717,7 @@ static int ds1305_probe(struct spi_device *spi) if (status < 0) { dev_dbg(&spi->dev, "can't %s, %d\n", "write", status); - goto fail0; + return status; } dev_dbg(&spi->dev, "ctrl %s: %3ph\n", "write", ds1305->ctrl); @@ -730,7 +729,7 @@ static int ds1305_probe(struct spi_device *spi) &value, sizeof value); if (status < 0) { dev_dbg(&spi->dev, "read HOUR --> %d\n", status); - goto fail0; + return status; } ds1305->hr12 = (DS1305_HR_12 & value) != 0; @@ -738,12 +737,12 @@ static int ds1305_probe(struct spi_device *spi) dev_dbg(&spi->dev, "AM/PM\n"); /* register RTC ... from here on, ds1305->ctrl needs locking */ - ds1305->rtc = rtc_device_register("ds1305", &spi->dev, + ds1305->rtc = devm_rtc_device_register(&spi->dev, "ds1305", &ds1305_ops, THIS_MODULE); if (IS_ERR(ds1305->rtc)) { status = PTR_ERR(ds1305->rtc); dev_dbg(&spi->dev, "register rtc --> %d\n", status); - goto fail0; + return status; } /* Maybe set up alarm IRQ; be ready to handle it triggering right @@ -754,12 +753,12 @@ static int ds1305_probe(struct spi_device *spi) */ if (spi->irq) { INIT_WORK(&ds1305->work, ds1305_work); - status = request_irq(spi->irq, ds1305_irq, + status = devm_request_irq(&spi->dev, spi->irq, ds1305_irq, 0, dev_name(&ds1305->rtc->dev), ds1305); if (status < 0) { dev_dbg(&spi->dev, "request_irq %d --> %d\n", spi->irq, status); - goto fail1; + return status; } device_set_wakeup_capable(&spi->dev, 1); @@ -769,18 +768,10 @@ static int ds1305_probe(struct spi_device *spi) status = sysfs_create_bin_file(&spi->dev.kobj, &nvram); if (status < 0) { dev_dbg(&spi->dev, "register nvram --> %d\n", status); - goto fail2; + return status; } return 0; - -fail2: - free_irq(spi->irq, ds1305); -fail1: - rtc_device_unregister(ds1305->rtc); -fail0: - kfree(ds1305); - return status; } static int ds1305_remove(struct spi_device *spi) @@ -792,13 +783,11 @@ static int ds1305_remove(struct spi_device *spi) /* carefully shut down irq and workqueue, if present */ if (spi->irq) { set_bit(FLAG_EXITING, &ds1305->flags); - free_irq(spi->irq, ds1305); + devm_free_irq(&spi->dev, spi->irq, ds1305); cancel_work_sync(&ds1305->work); } - rtc_device_unregister(ds1305->rtc); spi_set_drvdata(spi, NULL); - kfree(ds1305); return 0; }