From patchwork Sat Aug 17 06:43:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 267963 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-ea0-x23f.google.com (mail-ea0-x23f.google.com [IPv6:2a00:1450:4013:c01::23f]) (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 92A3E2C00F0 for ; Sat, 17 Aug 2013 16:44:16 +1000 (EST) Received: by mail-ea0-f191.google.com with SMTP id o10sf417700eaj.8 for ; Fri, 16 Aug 2013 23:44:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:from:to:cc:subject:date:message-id:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe:content-type; bh=/YgpBmQTfMdtXJEnDjA73gYe30oLUwsuJdaLKKhADVc=; b=C6/9MCC73qNODpnSV5fv6AzFSQQBsDN906M0b/GSzFDnlandwdcQHsrqQXmaW3n3RN xLv8iVUDS0uJaKNaQQVawufmjDGzvEDBkOEoPlk5GfVqrTeAdKLPDbW12BkU6Udnc23N zFCf7mPn/mJoxLhxw5Jzm//qZYnHM7NWJSbMJNVJqjuR4bUa1ST0Xs1LpfVEMuKY01yF mfdQ6WWyPrFXGO/WTCfe6m6AE6hS++NpHfgVxsDmvczcxsXpl3u2cNQjXoAusar8kngq mqXP4EcCsmPRCYg8AFcvOkJZqtUzW7a5imD/DHAXMJr4lpUCTed5etJzUCISWKmVzYaI 6BKQ== X-Received: by 10.180.102.74 with SMTP id fm10mr16861wib.4.1376721852039; Fri, 16 Aug 2013 23:44:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.180.126.9 with SMTP id mu9ls334308wib.46.gmail; Fri, 16 Aug 2013 23:44:11 -0700 (PDT) X-Received: by 10.204.230.80 with SMTP id jl16mr18728bkb.7.1376721851382; Fri, 16 Aug 2013 23:44:11 -0700 (PDT) Received: from smtp36.i.mail.ru (smtp36.i.mail.ru. [94.100.177.96]) by gmr-mx.google.com with ESMTPS id nl4si67605bkb.2.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 16 Aug 2013 23:44:11 -0700 (PDT) Received-SPF: pass (google.com: domain of shc_work@mail.ru designates 94.100.177.96 as permitted sender) client-ip=94.100.177.96; Received: from [188.134.40.128] (port=30725 helo=shc.zet) by smtp36.i.mail.ru with esmtpa (envelope-from ) id 1VAaF7-0003Yj-8u; Sat, 17 Aug 2013 10:44:09 +0400 From: Alexander Shiyan To: rtc-linux@googlegroups.com Cc: Alessandro Zummo , linux-kernel@vger.kernel.org, Alexander Shiyan Subject: [rtc-linux] [PATCH RESEND 1/3] rtc: ds1742: Using devm_ioremap_resource() Date: Sat, 17 Aug 2013 10:43:54 +0400 Message-Id: <1376721836-27153-1-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 1.8.1.5 X-Spam: Not detected X-Mras: Ok X-Original-Sender: shc_work@mail.ru X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of shc_work@mail.ru designates 94.100.177.96 as permitted sender) smtp.mail=shc_work@mail.ru; dkim=pass header.i=@mail.ru 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: , This patch replaces devm_request_mem_region() and devm_ioremap() by devm_ioremap_resource(). Signed-off-by: Alexander Shiyan --- drivers/rtc/rtc-ds1742.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c index eccdc62..9fba0ae 100644 --- a/drivers/rtc/rtc-ds1742.c +++ b/drivers/rtc/rtc-ds1742.c @@ -56,7 +56,6 @@ struct rtc_plat_data { void __iomem *ioaddr_nvram; void __iomem *ioaddr_rtc; size_t size_nvram; - size_t size; unsigned long last_jiffies; struct bin_attribute nvram_attr; }; @@ -168,22 +167,17 @@ static int ds1742_rtc_probe(struct platform_device *pdev) void __iomem *ioaddr; int ret = 0; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENODEV; pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) return -ENOMEM; - pdata->size = resource_size(res); - if (!devm_request_mem_region(&pdev->dev, res->start, pdata->size, - pdev->name)) - return -EBUSY; - ioaddr = devm_ioremap(&pdev->dev, res->start, pdata->size); - if (!ioaddr) - return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + ioaddr = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(ioaddr)) + return PTR_ERR(ioaddr); pdata->ioaddr_nvram = ioaddr; - pdata->size_nvram = pdata->size - RTC_SIZE; + pdata->size_nvram = resource_size(res) - RTC_SIZE; pdata->ioaddr_rtc = ioaddr + pdata->size_nvram; sysfs_bin_attr_init(&pdata->nvram_attr);