From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: linux-rtc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Alexandre Belloni <alexandre.belloni@bootlin.com>
Subject: [PATCH v2 4/9] rtc: pcf2123: convert to devm_rtc_allocate_device
Date: Wed, 14 Aug 2019 17:09:57 +0200 [thread overview]
Message-ID: <20190814151002.7324-4-alexandre.belloni@bootlin.com> (raw)
In-Reply-To: <20190814151002.7324-1-alexandre.belloni@bootlin.com>
This allows further improvement of the driver. Also remove the unecessary
error string as the core will already display error messages.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
drivers/rtc/rtc-pcf2123.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c
index 2e2a14134346..7d79180a4292 100644
--- a/drivers/rtc/rtc-pcf2123.c
+++ b/drivers/rtc/rtc-pcf2123.c
@@ -407,17 +407,12 @@ static int pcf2123_probe(struct spi_device *spi)
(spi->max_speed_hz + 500) / 1000);
/* Finalize the initialization */
- rtc = devm_rtc_device_register(&spi->dev, pcf2123_driver.driver.name,
- &pcf2123_rtc_ops, THIS_MODULE);
-
- if (IS_ERR(rtc)) {
- dev_err(&spi->dev, "failed to register.\n");
+ rtc = devm_rtc_allocate_device(&spi->dev);
+ if (IS_ERR(rtc))
return PTR_ERR(rtc);
- }
pcf2123->rtc = rtc;
-
/* Register alarm irq */
if (spi->irq > 0) {
ret = devm_request_threaded_irq(&spi->dev, spi->irq, NULL,
@@ -434,7 +429,12 @@ static int pcf2123_probe(struct spi_device *spi)
* support to this driver to generate interrupts more than once
* per minute.
*/
- pcf2123->rtc->uie_unsupported = 1;
+ rtc->uie_unsupported = 1;
+ rtc->ops = &pcf2123_rtc_ops;
+
+ ret = rtc_register_device(rtc);
+ if (ret)
+ return ret;
return 0;
}
--
2.21.0
next prev parent reply other threads:[~2019-08-14 15:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-14 15:09 [PATCH v2 1/9] rtc: pcf2123: stop using dev.platform_data Alexandre Belloni
2019-08-14 15:09 ` [PATCH v2 2/9] rtc: pcf2123: rename struct and variables Alexandre Belloni
2019-08-14 15:09 ` [PATCH v2 3/9] rtc: pcf2123: remove useless error path goto Alexandre Belloni
2019-08-14 15:09 ` Alexandre Belloni [this message]
2019-08-14 15:09 ` [PATCH v2 5/9] rtc: pcf2123: let the core handle range offsetting Alexandre Belloni
2019-08-14 15:09 ` [PATCH v2 6/9] rtc: pcf2123: don't use weekday alarm Alexandre Belloni
2019-08-14 15:10 ` [PATCH v2 7/9] rtc; pcf2123: fix possible alarm race condition Alexandre Belloni
2019-08-14 15:10 ` [PATCH v2 8/9] rtc: pcf2123: implement .alarm_irq_enable Alexandre Belloni
2019-08-14 15:10 ` [PATCH v2 9/9] rtc: pcf2123: add proper compatible string 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=20190814151002.7324-4-alexandre.belloni@bootlin.com \
--to=alexandre.belloni@bootlin.com \
--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).