From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: linux-rtc@vger.kernel.org, Andrew Lunn <andrew@lunn.ch>,
Gregory Clement <gregory.clement@bootlin.com>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 03/17] rtc: armada38x: remove armada38x_rtc_ops_noirq
Date: Mon, 11 Jan 2021 00:17:38 +0100 [thread overview]
Message-ID: <20210110231752.1418816-4-alexandre.belloni@bootlin.com> (raw)
In-Reply-To: <20210110231752.1418816-1-alexandre.belloni@bootlin.com>
Clear RTC_FEATURE_ALARM to signal that alarms are not available instead of
having a supplementary struct rtc_class_ops with a NULL .set_alarm.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
drivers/rtc/rtc-armada38x.c | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/drivers/rtc/rtc-armada38x.c b/drivers/rtc/rtc-armada38x.c
index 807a79c07f08..cc542e6b1d5b 100644
--- a/drivers/rtc/rtc-armada38x.c
+++ b/drivers/rtc/rtc-armada38x.c
@@ -458,14 +458,6 @@ static const struct rtc_class_ops armada38x_rtc_ops = {
.set_offset = armada38x_rtc_set_offset,
};
-static const struct rtc_class_ops armada38x_rtc_ops_noirq = {
- .read_time = armada38x_rtc_read_time,
- .set_time = armada38x_rtc_set_time,
- .read_alarm = armada38x_rtc_read_alarm,
- .read_offset = armada38x_rtc_read_offset,
- .set_offset = armada38x_rtc_set_offset,
-};
-
static const struct armada38x_rtc_data armada38x_data = {
.update_mbus_timing = rtc_update_38x_mbus_timing_params,
.read_rtc_reg = read_rtc_register_38x_wa,
@@ -540,20 +532,15 @@ static __init int armada38x_rtc_probe(struct platform_device *pdev)
}
platform_set_drvdata(pdev, rtc);
- if (rtc->irq != -1) {
+ if (rtc->irq != -1)
device_init_wakeup(&pdev->dev, 1);
- rtc->rtc_dev->ops = &armada38x_rtc_ops;
- } else {
- /*
- * If there is no interrupt available then we can't
- * use the alarm
- */
- rtc->rtc_dev->ops = &armada38x_rtc_ops_noirq;
- }
+ else
+ clear_bit(RTC_FEATURE_ALARM, rtc->rtc_dev->features);
/* Update RTC-MBUS bridge timing parameters */
rtc->data->update_mbus_timing(rtc);
+ rtc->rtc_dev->ops = &armada38x_rtc_ops;
rtc->rtc_dev->range_max = U32_MAX;
return devm_rtc_register_device(rtc->rtc_dev);
--
2.29.2
next prev parent reply other threads:[~2021-01-10 23:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-10 23:17 [PATCH 00/17] rtc: constify all rtc_class_ops Alexandre Belloni
2021-01-10 23:17 ` [PATCH 01/17] rtc: introduce features bitfield Alexandre Belloni
2021-01-10 23:17 ` [PATCH 02/17] rtc: pl031: use RTC_FEATURE_ALARM Alexandre Belloni
2021-01-11 22:00 ` Linus Walleij
2021-01-10 23:17 ` Alexandre Belloni [this message]
2021-01-10 23:17 ` [PATCH 04/17] rtc: cmos: remove cmos_rtc_ops_no_alarm Alexandre Belloni
2021-04-28 18:49 ` youling257
2021-04-28 20:20 ` Alexandre Belloni
2021-04-28 21:07 ` youling 257
2021-01-10 23:17 ` [PATCH 05/17] rtc: mv: remove mv_rtc_alarm_ops Alexandre Belloni
2021-01-10 23:17 ` [PATCH 06/17] rtc: m48t59: remove m48t02_rtc_ops Alexandre Belloni
2021-01-10 23:17 ` [PATCH 07/17] rtc: pcf2127: remove pcf2127_rtc_alrm_ops Alexandre Belloni
2021-01-10 23:17 ` [PATCH 08/17] rtc: pcf85063: remove pcf85063_rtc_ops_alarm Alexandre Belloni
2021-01-10 23:17 ` [PATCH 09/17] rtc: rx8010: drop a struct rtc_class_ops Alexandre Belloni
2021-01-10 23:17 ` [PATCH 10/17] rtc: pcf85363: " Alexandre Belloni
2021-01-10 23:17 ` [PATCH 11/17] rtc: m41t80: constify m41t80_rtc_ops Alexandre Belloni
2021-01-10 23:17 ` [PATCH 12/17] rtc: opal: constify opal_rtc_ops Alexandre Belloni
2021-01-10 23:17 ` [PATCH 13/17] rtc: rv3028: constify rv3028_rtc_ops Alexandre Belloni
2021-01-10 23:17 ` [PATCH 14/17] rtc: rv3029: constify rv3029_rtc_ops Alexandre Belloni
2021-01-10 23:17 ` [PATCH 15/17] rtc: rv3032: constify rv3032_rtc_ops Alexandre Belloni
2021-01-10 23:17 ` [PATCH 16/17] rtc: rv8803: constify rv8803_rtc_ops Alexandre Belloni
2021-01-10 23:17 ` [PATCH 17/17] rtc: tps65910: remove tps65910_rtc_ops_noirq 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=20210110231752.1418816-4-alexandre.belloni@bootlin.com \
--to=alexandre.belloni@bootlin.com \
--cc=a.zummo@towertech.it \
--cc=andrew@lunn.ch \
--cc=gregory.clement@bootlin.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=sebastian.hesselbarth@gmail.com \
/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).