From patchwork Sun Mar 26 14:41:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 9645057 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0971E601E9 for ; Sun, 26 Mar 2017 14:47:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB56B200DF for ; Sun, 26 Mar 2017 14:47:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC306205AF; Sun, 26 Mar 2017 14:47:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 99387200DF for ; Sun, 26 Mar 2017 14:47:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=kzHpfslCqct4XXW+DBXtf3rwC1EakZN50yaVacSq5QA=; b=JxAbFcUyBAEXWbfb2ZaaNcbxoV clJxpKtA0SFsXW8Gtu5x/3TGkwTYchwlVb+vm37kbotEraj+ODXi5NrQ6oyrb8qoK5H4dDD2mPIT0 1wTIiXVAzFmReqrb7ppFdRJZtBRBealYbqKHO1A9TszpfOGb8Mzb61Bur+XvxrtSpgfP2IqbEUdqS oYOy+u+mhUQuUpy5FLAB12FdowjF/1KPJREIQ8+/zwNHVHdWZk5gKhOdgrIipA24I0LJQiEThHvx7 Q1MsGxuUw3XHJEwBVbnjoTJ/DuBfD0VoRp9ecZFi3qiXN920f2XqapC18OMX9iWzwKdk/ubN2QqXk zA+W5Z/g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cs9Rm-0006fm-SS; Sun, 26 Mar 2017 14:47:10 +0000 Received: from mail-wr0-x230.google.com ([2a00:1450:400c:c0c::230]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cs9Ni-0003Xd-1E for linux-arm-kernel@lists.infradead.org; Sun, 26 Mar 2017 14:43:02 +0000 Received: by mail-wr0-x230.google.com with SMTP id w11so10702637wrc.3 for ; Sun, 26 Mar 2017 07:42:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=k7wbhBR1FgkhlaT+yf8h6b4Tthbkw9zuvc04Wju8OuI=; b=DB56WgbA5UdRlXs/ToCLLPTL5S0WJDB9WR8R9V5DMy90SsARAy03z/FgJ92IXtATZu NZfvIEgEy5aZN2JZFpUXh9H+w5/hK+j68ws/RWhWsDKLn2Tlwf44JffTfvWAXHcSsHE2 jrQ8B1q7Pix9D2EDHlc9g9TexOiQhJHbBGCsE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=k7wbhBR1FgkhlaT+yf8h6b4Tthbkw9zuvc04Wju8OuI=; b=BxbqkjhbEX5r9BtgR0TnthZEb0IsFsMTMqgylUsL64WLHk/Vs1Q6kY5cFdj/Mcm6ly r6BhjBjezvNZIqZXenrLJSogGS/fMZr5XZiv8W2ZfJyKAC1bloRdH+VEix8pYhZ0JDOW XS3rtcRFdlk1B0eD7gYmZVz2/ZgFx+kxmJKl5vokYt3DgXoEMfdxI2kgCTvgAEPuGSfT CF2nvk4vH1gc+PoNGMc1nNExU2GpDB6nPD38pTiJdPx6GP0uC+6vZZ3hWcDEgUrgno5v XcOaNDXokQedRFBHgTLNVGwwQ/KSWoNHL4ulAXOt/lltLiCIZjnZ/i132D8eNlCRvs1w 3wyA== X-Gm-Message-State: AFeK/H3uqPzoZWPNjOKiGt1+mjR45gpvcpmqBQVz33gUctcyU1vlI1zT6PH2u7wIs0AMeozM X-Received: by 10.223.170.210 with SMTP id i18mr17604570wrc.114.1490539356132; Sun, 26 Mar 2017 07:42:36 -0700 (PDT) Received: from localhost.localdomain (li1529-187.members.linode.com. [139.162.244.187]) by smtp.gmail.com with ESMTPSA id l90sm10619516wmi.25.2017.03.26.07.42.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Mar 2017 07:42:35 -0700 (PDT) From: Leo Yan To: Russell King , Dmitry Torokhov , Alessandro Zummo , Alexandre Belloni , Linus Walleij , Baptiste Reynal , Alex Williamson , Jaroslav Kysela , Takashi Iwai , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH 2/5] drivers/rtc/rtc-pl030.c: Convert to use devm_*() Date: Sun, 26 Mar 2017 22:41:51 +0800 Message-Id: <1490539314-9681-3-git-send-email-leo.yan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490539314-9681-1-git-send-email-leo.yan@linaro.org> References: <1490539314-9681-1-git-send-email-leo.yan@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170326_074258_729748_689FE870 X-CRM114-Status: GOOD ( 12.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leo Yan MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Convert driver to use devm_*() APIs so rely on driver model core layer to manage resources. This eliminates error path boilerplate and makes code neat. Signed-off-by: Leo Yan Acked-by: Linus Walleij --- drivers/rtc/rtc-pl030.c | 49 ++++++++++++------------------------------------- 1 file changed, 12 insertions(+), 37 deletions(-) diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c index f85a1a9..372b1fd 100644 --- a/drivers/rtc/rtc-pl030.c +++ b/drivers/rtc/rtc-pl030.c @@ -102,49 +102,30 @@ static int pl030_probe(struct amba_device *dev, const struct amba_id *id) struct pl030_rtc *rtc; int ret; - ret = amba_request_regions(dev, NULL); - if (ret) - goto err_req; - rtc = devm_kzalloc(&dev->dev, sizeof(*rtc), GFP_KERNEL); - if (!rtc) { - ret = -ENOMEM; - goto err_rtc; - } + if (!rtc) + return -ENOMEM; - rtc->base = ioremap(dev->res.start, resource_size(&dev->res)); - if (!rtc->base) { - ret = -ENOMEM; - goto err_rtc; - } + rtc->base = devm_ioremap_resource(&dev->dev, &dev->res); + if (IS_ERR(rtc->base)) + return PTR_ERR(rtc->base); __raw_writel(0, rtc->base + RTC_CR); __raw_writel(0, rtc->base + RTC_EOI); amba_set_drvdata(dev, rtc); - ret = request_irq(dev->irq[0], pl030_interrupt, 0, - "rtc-pl030", rtc); + ret = devm_request_irq(&dev->dev, dev->irq[0], pl030_interrupt, 0, + "rtc-pl030", rtc); if (ret) - goto err_irq; + return ret; - rtc->rtc = rtc_device_register("pl030", &dev->dev, &pl030_ops, - THIS_MODULE); - if (IS_ERR(rtc->rtc)) { - ret = PTR_ERR(rtc->rtc); - goto err_reg; - } + rtc->rtc = devm_rtc_device_register(&dev->dev, "pl030", &pl030_ops, + THIS_MODULE); + if (IS_ERR(rtc->rtc)) + return PTR_ERR(rtc->rtc); return 0; - - err_reg: - free_irq(dev->irq[0], rtc); - err_irq: - iounmap(rtc->base); - err_rtc: - amba_release_regions(dev); - err_req: - return ret; } static int pl030_remove(struct amba_device *dev) @@ -152,12 +133,6 @@ static int pl030_remove(struct amba_device *dev) struct pl030_rtc *rtc = amba_get_drvdata(dev); writel(0, rtc->base + RTC_CR); - - free_irq(dev->irq[0], rtc); - rtc_device_unregister(rtc->rtc); - iounmap(rtc->base); - amba_release_regions(dev); - return 0; }