rtc: rv8803: constify rv8803_rtc_ops
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Sun, 10 Jan 2021 23:17:51 +0000 (00:17 +0100)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Sat, 16 Jan 2021 22:19:27 +0000 (23:19 +0100)
Use RTC_FEATURE_ALARM to signal to the core whether alarms are available
instead of changing the global struct rtc_class_ops, allowing to make it
const.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20210110231752.1418816-17-alexandre.belloni@bootlin.com
drivers/rtc/rtc-rv8803.c

index d4ea6db51b26309a8de12cee596173460267dbbd..8821264e9385c5cd99bfc149c98a0d024e02f73d 100644 (file)
@@ -471,10 +471,13 @@ static int rv8803_nvram_read(void *priv, unsigned int offset,
        return 0;
 }
 
-static struct rtc_class_ops rv8803_rtc_ops = {
+static const struct rtc_class_ops rv8803_rtc_ops = {
        .read_time = rv8803_get_time,
        .set_time = rv8803_set_time,
        .ioctl = rv8803_ioctl,
+       .read_alarm = rv8803_get_alarm,
+       .set_alarm = rv8803_set_alarm,
+       .alarm_irq_enable = rv8803_alarm_irq_enable,
 };
 
 static int rx8900_trickle_charger_init(struct rv8803_data *rv8803)
@@ -567,12 +570,10 @@ static int rv8803_probe(struct i2c_client *client,
                if (err) {
                        dev_warn(&client->dev, "unable to request IRQ, alarms disabled\n");
                        client->irq = 0;
-               } else {
-                       rv8803_rtc_ops.read_alarm = rv8803_get_alarm;
-                       rv8803_rtc_ops.set_alarm = rv8803_set_alarm;
-                       rv8803_rtc_ops.alarm_irq_enable = rv8803_alarm_irq_enable;
                }
        }
+       if (!client->irq)
+               clear_bit(RTC_FEATURE_ALARM, rv8803->rtc->features);
 
        err = rv8803_write_reg(rv8803->client, RV8803_EXT, RV8803_EXT_WADA);
        if (err)