From: Thomas Bogendoerfer <tbogendoerfer@suse.de>
To: Joshua Kinard <kumba@gentoo.org>,
Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] rtc: ds1685: use devm_platform_ioremap_resource helper
Date: Fri, 11 Oct 2019 17:05:44 +0200 [thread overview]
Message-ID: <20191011150546.9186-2-tbogendoerfer@suse.de> (raw)
In-Reply-To: <20191011150546.9186-1-tbogendoerfer@suse.de>
Simplify ioremapping of registers by using devm_platform_ioremap_resource.
Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/rtc/rtc-ds1685.c | 23 +++--------------------
include/linux/rtc/ds1685.h | 1 -
2 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c
index 51f568473de8..349a8d1caca1 100644
--- a/drivers/rtc/rtc-ds1685.c
+++ b/drivers/rtc/rtc-ds1685.c
@@ -1040,7 +1040,6 @@ static int
ds1685_rtc_probe(struct platform_device *pdev)
{
struct rtc_device *rtc_dev;
- struct resource *res;
struct ds1685_priv *rtc;
struct ds1685_rtc_platform_data *pdata;
u8 ctrla, ctrlb, hours;
@@ -1070,25 +1069,9 @@ ds1685_rtc_probe(struct platform_device *pdev)
* that sits behind the IOC3 PCI metadevice.
*/
if (pdata->alloc_io_resources) {
- /* Get the platform resources. */
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res)
- return -ENXIO;
- rtc->size = resource_size(res);
-
- /* Request a memory region. */
- /* XXX: mmio-only for now. */
- if (!devm_request_mem_region(&pdev->dev, res->start, rtc->size,
- pdev->name))
- return -EBUSY;
-
- /*
- * Set the base address for the rtc, and ioremap its
- * registers.
- */
- rtc->regs = devm_ioremap(&pdev->dev, res->start, rtc->size);
- if (!rtc->regs)
- return -ENOMEM;
+ rtc->regs = devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(rtc->regs))
+ return PTR_ERR(rtc->regs);
}
/* Get the register step size. */
diff --git a/include/linux/rtc/ds1685.h b/include/linux/rtc/ds1685.h
index b9671d00d964..101c7adc05a2 100644
--- a/include/linux/rtc/ds1685.h
+++ b/include/linux/rtc/ds1685.h
@@ -43,7 +43,6 @@ struct ds1685_priv {
struct rtc_device *dev;
void __iomem *regs;
u32 regstep;
- size_t size;
int irq_num;
bool bcd_mode;
bool no_irq;
--
2.16.4
next prev parent reply other threads:[~2019-10-11 15:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-11 15:05 [PATCH 1/3] rts: ds1685: remove not needed fields from private struct Thomas Bogendoerfer
2019-10-11 15:05 ` Thomas Bogendoerfer [this message]
2019-10-12 22:49 ` [PATCH 2/3] rtc: ds1685: use devm_platform_ioremap_resource helper Joshua Kinard
2019-10-14 15:51 ` Alexandre Belloni
2019-10-11 15:05 ` [PATCH 3/3] rtc: ds1685: add indirect access method and remove plat_read/plat_write Thomas Bogendoerfer
2019-10-12 23:22 ` Joshua Kinard
2019-10-14 21:20 ` Thomas Bogendoerfer
2019-10-12 22:41 ` [PATCH 1/3] rts: ds1685: remove not needed fields from private struct Joshua Kinard
2019-10-14 15:50 ` Alexandre Belloni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191011150546.9186-2-tbogendoerfer@suse.de \
--to=tbogendoerfer@suse.de \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=kumba@gentoo.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).