rtc: rv3032: constify rv3032_rtc_ops
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Sun, 10 Jan 2021 23:17:50 +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-16-alexandre.belloni@bootlin.com
drivers/rtc/rtc-rv3032.c

index c9bcea7277579a7413ae818dc77697c4cb4af627..5161016bce0016d2524d52f0689c32d02fea52d2 100644 (file)
@@ -804,12 +804,15 @@ static void rv3032_hwmon_register(struct device *dev)
        devm_hwmon_device_register_with_info(dev, "rv3032", rv3032, &rv3032_hwmon_chip_info, NULL);
 }
 
-static struct rtc_class_ops rv3032_rtc_ops = {
+static const struct rtc_class_ops rv3032_rtc_ops = {
        .read_time = rv3032_get_time,
        .set_time = rv3032_set_time,
        .read_offset = rv3032_read_offset,
        .set_offset = rv3032_set_offset,
        .ioctl = rv3032_ioctl,
+       .read_alarm = rv3032_get_alarm,
+       .set_alarm = rv3032_set_alarm,
+       .alarm_irq_enable = rv3032_alarm_irq_enable,
 };
 
 static const struct regmap_config regmap_config = {
@@ -868,12 +871,10 @@ static int rv3032_probe(struct i2c_client *client)
                if (ret) {
                        dev_warn(&client->dev, "unable to request IRQ, alarms disabled\n");
                        client->irq = 0;
-               } else {
-                       rv3032_rtc_ops.read_alarm = rv3032_get_alarm;
-                       rv3032_rtc_ops.set_alarm = rv3032_set_alarm;
-                       rv3032_rtc_ops.alarm_irq_enable = rv3032_alarm_irq_enable;
                }
        }
+       if (!client->irq)
+               clear_bit(RTC_FEATURE_ALARM, rv3032->rtc->features);
 
        ret = regmap_update_bits(rv3032->regmap, RV3032_CTRL1,
                                 RV3032_CTRL1_WADA, RV3032_CTRL1_WADA);