From patchwork Tue Jul 2 16:50:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 256463 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-wg0-x239.google.com (mail-wg0-x239.google.com [IPv6:2a00:1450:400c:c00::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 3845F2C00B3 for ; Wed, 3 Jul 2013 02:50:16 +1000 (EST) Received: by mail-wg0-f57.google.com with SMTP id b12sf1321864wgh.2 for ; Tue, 02 Jul 2013 09:50:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:x-beenthere:from:to:cc:subject:date:message-id :x-mailer:x-spam:x-mras: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=B29YW/RjCkNGbpByaWh4iK7C9HRU08mGLwKX1Vm10ig=; b=PTk/Zo8lcT7ijiK1CgYqzs1S/aGlwvRJWqYNqaRchjbte5jWixqEYaAhiX60FL42Z0 z3nEH4WSExScYALvQXBpKlyIdTbarfPhAoubcArUWVa+t/0LfuGksww8SWtNJXKZH899 s/YnQcB/UQHsmbr5v4CjoVUwYRk3xSwybvHazm6VllPRmEl85k2gRhpfus07HU+Sj9cZ G8I1n6Spl/kfYYeDEQy8ekjxu0kxmF39b4BEooSz9UcUYn3UQ+s6O77v7R0xkP61FcKH ajYllqv6rwp9fBQBphfkT/y+17wmVh9TYqecHJ0r9WRDZNILXDGltmfnt5EbRyGClB0g cvxg== X-Received: by 10.180.126.3 with SMTP id mu3mr756157wib.20.1372783812840; Tue, 02 Jul 2013 09:50:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.180.90.137 with SMTP id bw9ls1062142wib.2.gmail; Tue, 02 Jul 2013 09:50:11 -0700 (PDT) X-Received: by 10.204.240.14 with SMTP id ky14mr2912902bkb.0.1372783811558; Tue, 02 Jul 2013 09:50:11 -0700 (PDT) Received: from smtp38.i.mail.ru (smtp38.i.mail.ru. [94.100.177.98]) by gmr-mx.google.com with ESMTPS id rg9si1196580bkb.3.2013.07.02.09.50.11 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 02 Jul 2013 09:50:11 -0700 (PDT) Received-SPF: pass (google.com: domain of shc_work@mail.ru designates 94.100.177.98 as permitted sender) client-ip=94.100.177.98; Received: from [188.134.40.128] (port=15142 helo=shc.zet) by smtp38.i.mail.ru with esmtpa (envelope-from ) id 1Uu3mM-0006Yk-Pl; Tue, 02 Jul 2013 20:50:10 +0400 From: Alexander Shiyan To: rtc-linux@googlegroups.com Cc: linux-kernel@vger.kernel.org, Alessandro Zummo , Alexander Shiyan Subject: [rtc-linux] [PATCH 1/3] rtc: ds1742: Using devm_ioremap_resource() Date: Tue, 2 Jul 2013 20:50:00 +0400 Message-Id: <1372783802-6569-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.98 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: , 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);