lkml.org 
[lkml]   [2021]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/17] rtc: pcf2127: remove pcf2127_rtc_alrm_ops
    Date
    Move the alarm callbacks in pcf2127_rtc_ops and use RTC_FEATURE_ALARM to
    signal to the core whether alarms are available instead of having a
    supplementary struct rtc_class_ops without alarm callbacks.

    Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
    ---
    drivers/rtc/rtc-pcf2127.c | 11 +++--------
    1 file changed, 3 insertions(+), 8 deletions(-)

    diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c
    index 39a7b5116aa4..68160d857ac1 100644
    --- a/drivers/rtc/rtc-pcf2127.c
    +++ b/drivers/rtc/rtc-pcf2127.c
    @@ -225,12 +225,6 @@ static int pcf2127_rtc_ioctl(struct device *dev,
    }
    }

    -static const struct rtc_class_ops pcf2127_rtc_ops = {
    - .ioctl = pcf2127_rtc_ioctl,
    - .read_time = pcf2127_rtc_read_time,
    - .set_time = pcf2127_rtc_set_time,
    -};
    -
    static int pcf2127_nvmem_read(void *priv, unsigned int offset,
    void *val, size_t bytes)
    {
    @@ -459,7 +453,7 @@ static irqreturn_t pcf2127_rtc_irq(int irq, void *dev)
    return IRQ_HANDLED;
    }

    -static const struct rtc_class_ops pcf2127_rtc_alrm_ops = {
    +static const struct rtc_class_ops pcf2127_rtc_ops = {
    .ioctl = pcf2127_rtc_ioctl,
    .read_time = pcf2127_rtc_read_time,
    .set_time = pcf2127_rtc_set_time,
    @@ -584,6 +578,7 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap,
    pcf2127->rtc->range_max = RTC_TIMESTAMP_END_2099;
    pcf2127->rtc->set_start_time = true; /* Sets actual start to 1970 */
    pcf2127->rtc->uie_unsupported = 1;
    + clear_bit(RTC_FEATURE_ALARM, pcf2127->rtc->features);

    if (alarm_irq > 0) {
    ret = devm_request_threaded_irq(dev, alarm_irq, NULL,
    @@ -598,7 +593,7 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap,

    if (alarm_irq > 0 || device_property_read_bool(dev, "wakeup-source")) {
    device_init_wakeup(dev, true);
    - pcf2127->rtc->ops = &pcf2127_rtc_alrm_ops;
    + set_bit(RTC_FEATURE_ALARM, pcf2127->rtc->features);
    }

    if (has_nvmem) {
    --
    2.29.2
    \
     
     \ /
      Last update: 2021-01-11 00:21    [W:4.197 / U:1.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site