Re: [PATCH 01/14] MIPS/alchemy/time: Migrate to new 'set-state' interface

[Manuel Lauss <manuel.lauss@xxxxxxxxx>]

On Mon, Jul 6, 2015 at 1:11 PM, Viresh Kumar <viresh.kumar@xxxxxxxxxx> wrote:
> Migrate alchemy driver to the new 'set-state' interface provided by
> clockevents core, the earlier 'set-mode' interface is marked obsolete
> now.
>
> This also enables us to implement callbacks for new states of clockevent
> devices, for example: ONESHOT_STOPPED.
>
> We weren't doing anything in the ->set_mode() callback. So, this patch
> doesn't provide any set-state callbacks.
>
> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
> Cc: Manuel Lauss <manuel.lauss@xxxxxxxxx>
> Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
> ---
>  arch/mips/alchemy/common/time.c | 6 ------
>  1 file changed, 6 deletions(-)
>
> diff --git a/arch/mips/alchemy/common/time.c b/arch/mips/alchemy/common/time.c
> index 50e17e13c18b..f99d3ec17a45 100644
> --- a/arch/mips/alchemy/common/time.c
> +++ b/arch/mips/alchemy/common/time.c
> @@ -69,11 +69,6 @@ static int au1x_rtcmatch2_set_next_event(unsigned long delta,
>         return 0;
>  }
>
> -static void au1x_rtcmatch2_set_mode(enum clock_event_mode mode,
> -                                   struct clock_event_device *cd)
> -{
> -}
> -
>  static irqreturn_t au1x_rtcmatch2_irq(int irq, void *dev_id)
>  {
>         struct clock_event_device *cd = dev_id;
> @@ -86,7 +81,6 @@ static struct clock_event_device au1x_rtcmatch2_clockdev = {
>         .features       = CLOCK_EVT_FEAT_ONESHOT,
>         .rating         = 1500,
>         .set_next_event = au1x_rtcmatch2_set_next_event,
> -       .set_mode       = au1x_rtcmatch2_set_mode,
>         .cpumask        = cpu_all_mask,
>  };

That's broken.  You need at least something like this (tested):
the cevt-r4k.c is broken the same way.

diff --git a/arch/mips/alchemy/common/time.c b/arch/mips/alchemy/common/time.c
index 50e17e1..ef1ca39 100644
--- a/arch/mips/alchemy/common/time.c
+++ b/arch/mips/alchemy/common/time.c
@@ -69,9 +69,9 @@ static int au1x_rtcmatch2_set_next_event(unsigned long delta,
        return 0;
 }

-static void au1x_rtcmatch2_set_mode(enum clock_event_mode mode,
-                                   struct clock_event_device *cd)
+static int au1x_rtcmatch2_set_nop(struct clock_event_device *cd)
 {
+       return 0;
 }

 static irqreturn_t au1x_rtcmatch2_irq(int irq, void *dev_id)
@@ -86,7 +86,8 @@ static struct clock_event_device au1x_rtcmatch2_clockdev = {
        .features       = CLOCK_EVT_FEAT_ONESHOT,
        .rating         = 1500,
        .set_next_event = au1x_rtcmatch2_set_next_event,
-       .set_mode       = au1x_rtcmatch2_set_mode,
+       .set_state_oneshot      = au1x_rtcmatch2_set_nop,
+       .set_state_shutdown     = au1x_rtcmatch2_set_nop,
        .cpumask        = cpu_all_mask,
 };


Manuel