From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: Alessandro Zummo <a.zummo@towertech.it>,
Joshua Kinard <kumba@gentoo.org>,
Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 02/29] rtc: ds1685: drop no_irq
Date: Wed, 9 Mar 2022 17:22:33 +0100 [thread overview]
Message-ID: <20220309162301.61679-2-alexandre.belloni@bootlin.com> (raw)
In-Reply-To: <20220309162301.61679-1-alexandre.belloni@bootlin.com>
No platforms are currently setting no_irq. Anyway, letting platform_get_irq
fail is fine as this means that there is no IRQ. In that case, clear
RTC_FEATURE_ALARM so the core knows there are no alarms.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
drivers/rtc/rtc-ds1685.c | 14 +++++---------
include/linux/rtc/ds1685.h | 1 -
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c
index 0ec1e44e3431..a24331ba8a5f 100644
--- a/drivers/rtc/rtc-ds1685.c
+++ b/drivers/rtc/rtc-ds1685.c
@@ -1285,13 +1285,10 @@ ds1685_rtc_probe(struct platform_device *pdev)
* there won't be an automatic way of notifying the kernel about it,
* unless ctrlc is explicitly polled.
*/
- if (!pdata->no_irq) {
- ret = platform_get_irq(pdev, 0);
- if (ret <= 0)
- return ret;
-
- rtc->irq_num = ret;
-
+ rtc->irq_num = platform_get_irq(pdev, 0);
+ if (rtc->irq_num <= 0) {
+ clear_bit(RTC_FEATURE_ALARM, rtc_dev->features);
+ } else {
/* Request an IRQ. */
ret = devm_request_threaded_irq(&pdev->dev, rtc->irq_num,
NULL, ds1685_rtc_irq_handler,
@@ -1305,7 +1302,6 @@ ds1685_rtc_probe(struct platform_device *pdev)
rtc->irq_num = 0;
}
}
- rtc->no_irq = pdata->no_irq;
/* Setup complete. */
ds1685_rtc_switch_to_bank0(rtc);
@@ -1394,7 +1390,7 @@ ds1685_rtc_poweroff(struct platform_device *pdev)
* have been taken care of by the shutdown scripts and this
* is the final function call.
*/
- if (!rtc->no_irq)
+ if (rtc->irq_num)
disable_irq_nosync(rtc->irq_num);
/* Oscillator must be on and the countdown chain enabled. */
diff --git a/include/linux/rtc/ds1685.h b/include/linux/rtc/ds1685.h
index 67ee9d20cc5a..5a41c3bbcbe3 100644
--- a/include/linux/rtc/ds1685.h
+++ b/include/linux/rtc/ds1685.h
@@ -46,7 +46,6 @@ struct ds1685_priv {
u32 regstep;
int irq_num;
bool bcd_mode;
- bool no_irq;
u8 (*read)(struct ds1685_priv *, int);
void (*write)(struct ds1685_priv *, int, u8);
void (*prepare_poweroff)(void);
--
2.35.1
next prev parent reply other threads:[~2022-03-09 16:50 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-09 16:22 [PATCH 01/29] rtc: ds1685: switch to RTC_FEATURE_UPDATE_INTERRUPT Alexandre Belloni
2022-03-09 16:22 ` Alexandre Belloni [this message]
2022-03-09 16:22 ` [PATCH 03/29] rtc: ds1307: " Alexandre Belloni
2022-03-09 16:22 ` [PATCH 04/29] rtc: mpc5121: let the core handle the alarm resolution Alexandre Belloni
2022-03-09 16:22 ` [PATCH 05/29] rtc: mpc5121: switch to RTC_FEATURE_UPDATE_INTERRUPT Alexandre Belloni
2022-03-09 16:22 ` [PATCH 06/29] rtc: m41t80: " Alexandre Belloni
2022-03-09 16:22 ` [PATCH 07/29] rtc: opal: " Alexandre Belloni
2022-03-09 16:22 ` [PATCH 08/29] rtc: pcf2123: " Alexandre Belloni
2022-03-09 16:22 ` [PATCH 09/29] rtc: pcf2123: set RTC_FEATURE_ALARM_RES_MINUTE Alexandre Belloni
2022-03-09 16:22 ` [PATCH 10/29] rtc: pcf2127: switch to RTC_FEATURE_UPDATE_INTERRUPT Alexandre Belloni
2022-03-09 16:22 ` [PATCH 11/29] rtc: pcf2127: set RTC_FEATURE_ALARM_RES_2S Alexandre Belloni
2022-03-10 16:09 ` Hugo Villeneuve
2022-03-10 20:58 ` Alexandre Belloni
2022-03-10 21:12 ` Hugo Villeneuve
2022-03-17 15:28 ` Hugo Villeneuve
2022-03-17 17:16 ` Alexandre Belloni
2022-05-24 15:10 ` Hugo Villeneuve
2022-12-15 15:12 ` Hugo Villeneuve
2022-03-09 16:22 ` [PATCH 12/29] rtc: pcf85063: switch to RTC_FEATURE_UPDATE_INTERRUPT Alexandre Belloni
2022-03-09 16:22 ` [PATCH 13/29] rtc: pcf85063: set RTC_FEATURE_ALARM_RES_2S Alexandre Belloni
2022-03-09 16:22 ` [PATCH 14/29] rtc: pcf8523: switch to RTC_FEATURE_UPDATE_INTERRUPT Alexandre Belloni
2022-03-09 16:22 ` [PATCH 15/29] rtc: pcf8523: let the core handle the alarm resolution Alexandre Belloni
2022-03-09 16:22 ` [PATCH 16/29] rtc: pcf8563: " Alexandre Belloni
2022-03-09 16:22 ` [PATCH 17/29] rtc: pcf8563: switch to RTC_FEATURE_UPDATE_INTERRUPT Alexandre Belloni
2022-03-09 16:22 ` [PATCH 18/29] rtc: spear: switch to devm_rtc_allocate_device Alexandre Belloni
2022-03-10 3:29 ` Viresh Kumar
2022-03-09 16:22 ` [PATCH 19/29] rtc: spear: set range Alexandre Belloni
2022-03-10 3:28 ` Viresh Kumar
2022-03-09 16:22 ` [PATCH 20/29] rtc: spear: drop uie_unsupported Alexandre Belloni
2022-03-10 3:29 ` Viresh Kumar
2022-03-09 16:22 ` [PATCH 21/29] rtc: spear: fix spear_rtc_read_time Alexandre Belloni
2022-03-10 3:28 ` Viresh Kumar
2022-03-09 16:22 ` [PATCH 22/29] rtc: add new RTC_FEATURE_ALARM_WAKEUP_ONLY feature Alexandre Belloni
2022-03-09 16:22 ` [PATCH 23/29] rtc: efi: switch to devm_rtc_allocate_device Alexandre Belloni
2022-03-09 16:22 ` [PATCH 24/29] rtc: efi: switch to RTC_FEATURE_UPDATE_INTERRUPT Alexandre Belloni
2022-03-09 16:22 ` [PATCH 25/29] rtc: hym8563: switch to devm_rtc_allocate_device Alexandre Belloni
2022-03-09 16:22 ` [PATCH 26/29] rtc: hym8563: let the core handle the alarm resolution Alexandre Belloni
2022-03-09 16:22 ` [PATCH 27/29] rtc: hym8563: switch to RTC_FEATURE_UPDATE_INTERRUPT Alexandre Belloni
2022-03-09 16:22 ` [PATCH 28/29] rtc: xgene: stop using uie_unsupported Alexandre Belloni
2022-03-09 16:23 ` [PATCH 29/29] rtc: remove uie_unsupported 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=20220309162301.61679-2-alexandre.belloni@bootlin.com \
--to=alexandre.belloni@bootlin.com \
--cc=a.zummo@towertech.it \
--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).