From: Viresh Kumar <viresh.kumar@linaro.org> To: Thomas Gleixner <tglx@linutronix.de>, Daniel Lezcano <daniel.lezcano@linaro.org> Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Viresh Kumar <viresh.kumar@linaro.org>, Magnus Damm <damm+renesas@opensource.se>, Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>, Paul Mundt <lethal@linux-sh.org> Subject: [PATCH 22/41] clocksource: sh_tmu: Migrate to new 'set-state' interface Date: Thu, 18 Jun 2015 16:24:36 +0530 [thread overview] Message-ID: <e3e76df10e37347e95579ce678d52792408d9c99.1434622147.git.viresh.kumar@linaro.org> (raw) In-Reply-To: <cover.1434622147.git.viresh.kumar@linaro.org> In-Reply-To: <cover.1434622147.git.viresh.kumar@linaro.org> Migrate sh_tmu 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. Cc: Magnus Damm <damm+renesas@opensource.se> Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Cc: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/clocksource/sh_tmu.c | 63 +++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c index b6b8fa3cd211..43c98143f79a 100644 --- a/drivers/clocksource/sh_tmu.c +++ b/drivers/clocksource/sh_tmu.c @@ -240,7 +240,7 @@ static irqreturn_t sh_tmu_interrupt(int irq, void *dev_id) struct sh_tmu_channel *ch = dev_id; /* disable or acknowledge interrupt */ - if (ch->ced.mode == CLOCK_EVT_MODE_ONESHOT) + if (clockevent_state_oneshot(&ch->ced)) sh_tmu_write(ch, TCR, TCR_TPSC_CLK4); else sh_tmu_write(ch, TCR, TCR_UNIE | TCR_TPSC_CLK4); @@ -358,42 +358,37 @@ static void sh_tmu_clock_event_start(struct sh_tmu_channel *ch, int periodic) } } -static void sh_tmu_clock_event_mode(enum clock_event_mode mode, - struct clock_event_device *ced) +static int sh_tmu_clock_event_shutdown(struct clock_event_device *ced) +{ + struct sh_tmu_channel *ch = ced_to_sh_tmu(ced); + + sh_tmu_disable(ch); + return 0; +} + +static int sh_tmu_clock_event_set_state(struct clock_event_device *ced, + int periodic) { struct sh_tmu_channel *ch = ced_to_sh_tmu(ced); - int disabled = 0; /* deal with old setting first */ - switch (ced->mode) { - case CLOCK_EVT_MODE_PERIODIC: - case CLOCK_EVT_MODE_ONESHOT: + if (clockevent_state_oneshot(ced) || clockevent_state_periodic(ced)) sh_tmu_disable(ch); - disabled = 1; - break; - default: - break; - } - switch (mode) { - case CLOCK_EVT_MODE_PERIODIC: - dev_info(&ch->tmu->pdev->dev, - "ch%u: used for periodic clock events\n", ch->index); - sh_tmu_clock_event_start(ch, 1); - break; - case CLOCK_EVT_MODE_ONESHOT: - dev_info(&ch->tmu->pdev->dev, - "ch%u: used for oneshot clock events\n", ch->index); - sh_tmu_clock_event_start(ch, 0); - break; - case CLOCK_EVT_MODE_UNUSED: - if (!disabled) - sh_tmu_disable(ch); - break; - case CLOCK_EVT_MODE_SHUTDOWN: - default: - break; - } + dev_info(&ch->tmu->pdev->dev, "ch%u: used for %s clock events\n", + ch->index, periodic ? "periodic" : "oneshot"); + sh_tmu_clock_event_start(ch, periodic); + return 0; +} + +static int sh_tmu_clock_event_set_oneshot(struct clock_event_device *ced) +{ + return sh_tmu_clock_event_set_state(ced, 0); +} + +static int sh_tmu_clock_event_set_periodic(struct clock_event_device *ced) +{ + return sh_tmu_clock_event_set_state(ced, 1); } static int sh_tmu_clock_event_next(unsigned long delta, @@ -401,7 +396,7 @@ static int sh_tmu_clock_event_next(unsigned long delta, { struct sh_tmu_channel *ch = ced_to_sh_tmu(ced); - BUG_ON(ced->mode != CLOCK_EVT_MODE_ONESHOT); + BUG_ON(!clockevent_state_oneshot(ced)); /* program new delta value */ sh_tmu_set_next(ch, delta, 0); @@ -430,7 +425,9 @@ static void sh_tmu_register_clockevent(struct sh_tmu_channel *ch, ced->rating = 200; ced->cpumask = cpu_possible_mask; ced->set_next_event = sh_tmu_clock_event_next; - ced->set_mode = sh_tmu_clock_event_mode; + ced->set_state_shutdown = sh_tmu_clock_event_shutdown; + ced->set_state_periodic = sh_tmu_clock_event_set_periodic; + ced->set_state_oneshot = sh_tmu_clock_event_set_oneshot; ced->suspend = sh_tmu_clock_event_suspend; ced->resume = sh_tmu_clock_event_resume; -- 2.4.0
WARNING: multiple messages have this Message-ID (diff)
From: viresh.kumar@linaro.org (Viresh Kumar) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 22/41] clocksource: sh_tmu: Migrate to new 'set-state' interface Date: Thu, 18 Jun 2015 16:24:36 +0530 [thread overview] Message-ID: <e3e76df10e37347e95579ce678d52792408d9c99.1434622147.git.viresh.kumar@linaro.org> (raw) In-Reply-To: <cover.1434622147.git.viresh.kumar@linaro.org> Migrate sh_tmu 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. Cc: Magnus Damm <damm+renesas@opensource.se> Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Cc: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/clocksource/sh_tmu.c | 63 +++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c index b6b8fa3cd211..43c98143f79a 100644 --- a/drivers/clocksource/sh_tmu.c +++ b/drivers/clocksource/sh_tmu.c @@ -240,7 +240,7 @@ static irqreturn_t sh_tmu_interrupt(int irq, void *dev_id) struct sh_tmu_channel *ch = dev_id; /* disable or acknowledge interrupt */ - if (ch->ced.mode == CLOCK_EVT_MODE_ONESHOT) + if (clockevent_state_oneshot(&ch->ced)) sh_tmu_write(ch, TCR, TCR_TPSC_CLK4); else sh_tmu_write(ch, TCR, TCR_UNIE | TCR_TPSC_CLK4); @@ -358,42 +358,37 @@ static void sh_tmu_clock_event_start(struct sh_tmu_channel *ch, int periodic) } } -static void sh_tmu_clock_event_mode(enum clock_event_mode mode, - struct clock_event_device *ced) +static int sh_tmu_clock_event_shutdown(struct clock_event_device *ced) +{ + struct sh_tmu_channel *ch = ced_to_sh_tmu(ced); + + sh_tmu_disable(ch); + return 0; +} + +static int sh_tmu_clock_event_set_state(struct clock_event_device *ced, + int periodic) { struct sh_tmu_channel *ch = ced_to_sh_tmu(ced); - int disabled = 0; /* deal with old setting first */ - switch (ced->mode) { - case CLOCK_EVT_MODE_PERIODIC: - case CLOCK_EVT_MODE_ONESHOT: + if (clockevent_state_oneshot(ced) || clockevent_state_periodic(ced)) sh_tmu_disable(ch); - disabled = 1; - break; - default: - break; - } - switch (mode) { - case CLOCK_EVT_MODE_PERIODIC: - dev_info(&ch->tmu->pdev->dev, - "ch%u: used for periodic clock events\n", ch->index); - sh_tmu_clock_event_start(ch, 1); - break; - case CLOCK_EVT_MODE_ONESHOT: - dev_info(&ch->tmu->pdev->dev, - "ch%u: used for oneshot clock events\n", ch->index); - sh_tmu_clock_event_start(ch, 0); - break; - case CLOCK_EVT_MODE_UNUSED: - if (!disabled) - sh_tmu_disable(ch); - break; - case CLOCK_EVT_MODE_SHUTDOWN: - default: - break; - } + dev_info(&ch->tmu->pdev->dev, "ch%u: used for %s clock events\n", + ch->index, periodic ? "periodic" : "oneshot"); + sh_tmu_clock_event_start(ch, periodic); + return 0; +} + +static int sh_tmu_clock_event_set_oneshot(struct clock_event_device *ced) +{ + return sh_tmu_clock_event_set_state(ced, 0); +} + +static int sh_tmu_clock_event_set_periodic(struct clock_event_device *ced) +{ + return sh_tmu_clock_event_set_state(ced, 1); } static int sh_tmu_clock_event_next(unsigned long delta, @@ -401,7 +396,7 @@ static int sh_tmu_clock_event_next(unsigned long delta, { struct sh_tmu_channel *ch = ced_to_sh_tmu(ced); - BUG_ON(ced->mode != CLOCK_EVT_MODE_ONESHOT); + BUG_ON(!clockevent_state_oneshot(ced)); /* program new delta value */ sh_tmu_set_next(ch, delta, 0); @@ -430,7 +425,9 @@ static void sh_tmu_register_clockevent(struct sh_tmu_channel *ch, ced->rating = 200; ced->cpumask = cpu_possible_mask; ced->set_next_event = sh_tmu_clock_event_next; - ced->set_mode = sh_tmu_clock_event_mode; + ced->set_state_shutdown = sh_tmu_clock_event_shutdown; + ced->set_state_periodic = sh_tmu_clock_event_set_periodic; + ced->set_state_oneshot = sh_tmu_clock_event_set_oneshot; ced->suspend = sh_tmu_clock_event_suspend; ced->resume = sh_tmu_clock_event_resume; -- 2.4.0
next prev parent reply other threads:[~2015-06-18 10:56 UTC|newest] Thread overview: 171+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <cover.1434622147.git.viresh.kumar@linaro.org> 2015-06-18 10:54 ` [PATCH 01/41] clocksource: asm9260: Migrate to new 'set-state' interface Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-30 8:25 ` Daniel Lezcano 2015-06-30 8:25 ` Daniel Lezcano 2015-06-30 9:00 ` Viresh Kumar 2015-06-30 9:00 ` Viresh Kumar 2015-06-30 9:20 ` Daniel Lezcano 2015-06-30 9:20 ` Daniel Lezcano 2015-07-08 5:37 ` Vineet Gupta 2015-07-08 5:37 ` Vineet Gupta 2015-07-08 5:37 ` Vineet Gupta 2015-07-08 5:43 ` Viresh Kumar 2015-07-08 5:43 ` Viresh Kumar 2015-07-08 6:14 ` Vineet Gupta 2015-07-08 6:14 ` Vineet Gupta 2015-06-18 10:54 ` [PATCH 02/41] clocksource: cadence_ttc: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-25 23:15 ` Sören Brinkmann 2015-06-25 23:15 ` Sören Brinkmann 2015-06-30 8:28 ` Daniel Lezcano 2015-06-30 8:28 ` Daniel Lezcano 2015-06-18 10:54 ` [PATCH 03/41] clocksource: clps711x: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 04/41] clocksource: dummy_timer: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 05/41] clocksource: dw_apb: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 06/41] clocksource: exynos_mct: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 16:38 ` Alexey Klimov 2015-06-18 16:38 ` Alexey Klimov 2015-06-19 2:14 ` Viresh Kumar 2015-06-19 2:14 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 07/41] clocksource: fsl_ftm: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 08/41] clocksource: i8253: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 09/41] clocksource: meson6: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-20 6:53 ` Carlo Caione 2015-06-20 6:53 ` Carlo Caione 2015-06-18 10:54 ` [PATCH 10/41] clocksource: metag_generic: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 11/41] clocksource: mips-gic: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 12/41] clocksource: moxart: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 13/41] clocksource: mtk: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 14/41] clocksource: mxs: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-07-17 5:28 ` Stefan Wahren 2015-07-17 5:28 ` Stefan Wahren 2015-06-18 10:54 ` [PATCH 15/41] clocksource: nomadik-mtu: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-07-14 11:11 ` Linus Walleij 2015-07-14 11:11 ` Linus Walleij 2015-06-18 10:54 ` [PATCH 16/41] clocksource: pxa: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-07-04 15:42 ` Robert Jarzmik 2015-07-04 15:42 ` Robert Jarzmik 2015-07-05 3:37 ` Viresh Kumar 2015-07-05 3:37 ` Viresh Kumar 2015-07-06 6:13 ` Robert Jarzmik 2015-07-06 6:13 ` Robert Jarzmik 2015-06-18 10:54 ` [PATCH 17/41] clocksource: qcom: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-19 19:10 ` Stephen Boyd 2015-06-19 19:10 ` Stephen Boyd 2015-06-18 10:54 ` [PATCH 18/41] clocksource: rockchip: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 19/41] clocksource: samsung_pwm: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 20/41] clocksource: sh_cmt: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 13:10 ` Laurent Pinchart 2015-06-18 13:10 ` Laurent Pinchart 2015-06-18 10:54 ` [PATCH 21/41] clocksource: sh_mtu2: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 13:10 ` Laurent Pinchart 2015-06-18 13:10 ` Laurent Pinchart 2015-06-18 10:54 ` Viresh Kumar [this message] 2015-06-18 10:54 ` [PATCH 22/41] clocksource: sh_tmu: " Viresh Kumar 2015-06-18 13:10 ` Laurent Pinchart 2015-06-18 13:10 ` Laurent Pinchart 2015-06-18 10:54 ` [PATCH 23/41] clocksource: sun4i: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 12:01 ` Maxime Ripard 2015-06-18 12:01 ` Maxime Ripard 2015-06-18 12:23 ` Viresh Kumar 2015-06-18 12:23 ` Viresh Kumar 2015-06-19 10:30 ` Maxime Ripard 2015-06-19 10:30 ` Maxime Ripard 2015-06-18 10:54 ` [PATCH 24/41] clocksource: tcb_clksrc: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 25/41] clocksource: tegra20: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-07-02 19:41 ` Daniel Lezcano 2015-07-02 19:41 ` Daniel Lezcano 2015-07-03 8:54 ` Viresh Kumar 2015-07-03 8:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 26/41] clocksource: time-armada-370-xp: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 27/41] clocksource: efm32: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 28/41] clocksource: orion: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 29/41] clocksource: atlas7: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 30/41] clocksource: atmel: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 14:28 ` Alexandre Belloni 2015-06-18 14:28 ` Alexandre Belloni 2015-06-18 10:54 ` [PATCH 31/41] clocksource: atmel-st: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 14:40 ` Alexandre Belloni 2015-06-18 14:40 ` Alexandre Belloni 2015-06-19 1:49 ` Viresh Kumar 2015-06-19 1:49 ` Viresh Kumar 2015-06-19 11:48 ` Alexandre Belloni 2015-06-19 11:48 ` Alexandre Belloni 2015-06-19 11:52 ` Viresh Kumar 2015-06-19 11:52 ` Viresh Kumar 2015-06-19 12:06 ` Alexandre Belloni 2015-06-19 12:06 ` Alexandre Belloni 2015-06-18 10:54 ` [PATCH 32/41] clocksource: digicolor: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-23 10:17 ` Baruch Siach 2015-06-23 10:17 ` Baruch Siach 2015-06-23 10:21 ` Viresh Kumar 2015-06-23 10:21 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 33/41] clocksource: integrator: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-07-14 13:35 ` Linus Walleij 2015-07-14 13:35 ` Linus Walleij 2015-06-18 10:54 ` [PATCH 34/41] clocksource: keystone: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 35/41] clocksource: prima2: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 36/41] clocksource: stm32: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 11:09 ` Maxime Coquelin 2015-06-18 11:09 ` Maxime Coquelin 2015-06-18 11:32 ` Viresh Kumar 2015-06-18 11:32 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 37/41] clocksource: sun5i: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 38/41] clocksource: u300: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-07-14 13:36 ` Linus Walleij 2015-07-14 13:36 ` Linus Walleij 2015-06-18 10:54 ` [PATCH 39/41] clocksource: vf_pit: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-07-03 8:10 ` Stefan Agner 2015-07-03 8:10 ` Stefan Agner 2015-07-03 8:57 ` Viresh Kumar 2015-07-03 8:57 ` Viresh Kumar 2015-07-03 11:11 ` Stefan Agner 2015-07-03 11:11 ` Stefan Agner 2015-07-03 11:17 ` Viresh Kumar 2015-07-03 11:17 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 40/41] clocksource: vt8500: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 41/41] clocksource: zevio: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-07-02 20:11 ` Daniel Lezcano 2015-07-02 20:11 ` Daniel Lezcano 2015-07-03 8:56 ` Viresh Kumar 2015-07-03 8:56 ` Viresh Kumar 2015-07-03 8:59 ` Daniel Lezcano 2015-07-03 8:59 ` Daniel Lezcano
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=e3e76df10e37347e95579ce678d52792408d9c99.1434622147.git.viresh.kumar@linaro.org \ --to=viresh.kumar@linaro.org \ --cc=damm+renesas@opensource.se \ --cc=daniel.lezcano@linaro.org \ --cc=laurent.pinchart+renesas@ideasonboard.com \ --cc=lethal@linux-sh.org \ --cc=linaro-kernel@lists.linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=tglx@linutronix.de \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.