From: Boris BREZILLON <boris.brezillon@free-electrons.com>
To: "Gaël PORTAY" <g.portay@overkiz.com>
Cc: linux-pwm@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Nicolas Ferre <nicolas.ferre@atmel.com>,
linux-kernel@vger.kernel.org,
Thierry Reding <thierry.reding@gmail.com>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>,
Thomas Gleixner <tglx@linutronix.de>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCHv2 4/4] clocksource: tcb_clksrc: unprepare clock in case of failure
Date: Wed, 3 Sep 2014 12:10:15 +0200 [thread overview]
Message-ID: <20140903121015.2f756e4d@bbrezillon> (raw)
In-Reply-To: <1409329003-17252-5-git-send-email-g.portay@overkiz.com>
On Fri, 29 Aug 2014 18:16:43 +0200
Gaël PORTAY <g.portay@overkiz.com> wrote:
> The clock is not unprepared in case of the request IRQ fails.
>
> Also update to request_irq.
As you're doing 2 different things in this commit (first move to
request_irq and then disable the TC clk if the request fails) I would
have chosen another commit title, like
"clocksource: tcb_clksrc: sanitize IRQ request"
Otherwise, you have my
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
>
> Signed-off-by: Gaël PORTAY <g.portay@overkiz.com>
> ---
> drivers/clocksource/tcb_clksrc.c | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c
> index f922e81..8bdbc45 100644
> --- a/drivers/clocksource/tcb_clksrc.c
> +++ b/drivers/clocksource/tcb_clksrc.c
> @@ -178,12 +178,6 @@ static irqreturn_t ch2_irq(int irq, void *handle)
> return IRQ_NONE;
> }
>
> -static struct irqaction tc_irqaction = {
> - .name = "tc_clkevt",
> - .flags = IRQF_TIMER,
> - .handler = ch2_irq,
> -};
> -
> static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
> {
> int ret;
> @@ -198,15 +192,16 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
>
> clkevt.regs = tc->regs;
> clkevt.clk = t2_clk;
> - tc_irqaction.dev_id = &clkevt;
>
> timer_clock = clk32k_divisor_idx;
>
> clkevt.clkevt.cpumask = cpumask_of(0);
>
> - ret = setup_irq(irq, &tc_irqaction);
> - if (ret)
> + ret = request_irq(irq, ch2_irq, IRQF_TIMER, "tc_clkevt", &clkevt);
> + if (ret) {
> + clk_disable_unprepare(t2_clk);
> return ret;
> + }
>
> clockevents_config_and_register(&clkevt.clkevt, 32768, 1, 0xffff);
>
--
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: boris.brezillon@free-electrons.com (Boris BREZILLON)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv2 4/4] clocksource: tcb_clksrc: unprepare clock in case of failure
Date: Wed, 3 Sep 2014 12:10:15 +0200 [thread overview]
Message-ID: <20140903121015.2f756e4d@bbrezillon> (raw)
In-Reply-To: <1409329003-17252-5-git-send-email-g.portay@overkiz.com>
On Fri, 29 Aug 2014 18:16:43 +0200
Ga?l PORTAY <g.portay@overkiz.com> wrote:
> The clock is not unprepared in case of the request IRQ fails.
>
> Also update to request_irq.
As you're doing 2 different things in this commit (first move to
request_irq and then disable the TC clk if the request fails) I would
have chosen another commit title, like
"clocksource: tcb_clksrc: sanitize IRQ request"
Otherwise, you have my
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
>
> Signed-off-by: Ga?l PORTAY <g.portay@overkiz.com>
> ---
> drivers/clocksource/tcb_clksrc.c | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c
> index f922e81..8bdbc45 100644
> --- a/drivers/clocksource/tcb_clksrc.c
> +++ b/drivers/clocksource/tcb_clksrc.c
> @@ -178,12 +178,6 @@ static irqreturn_t ch2_irq(int irq, void *handle)
> return IRQ_NONE;
> }
>
> -static struct irqaction tc_irqaction = {
> - .name = "tc_clkevt",
> - .flags = IRQF_TIMER,
> - .handler = ch2_irq,
> -};
> -
> static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
> {
> int ret;
> @@ -198,15 +192,16 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
>
> clkevt.regs = tc->regs;
> clkevt.clk = t2_clk;
> - tc_irqaction.dev_id = &clkevt;
>
> timer_clock = clk32k_divisor_idx;
>
> clkevt.clkevt.cpumask = cpumask_of(0);
>
> - ret = setup_irq(irq, &tc_irqaction);
> - if (ret)
> + ret = request_irq(irq, ch2_irq, IRQF_TIMER, "tc_clkevt", &clkevt);
> + if (ret) {
> + clk_disable_unprepare(t2_clk);
> return ret;
> + }
>
> clockevents_config_and_register(&clkevt.clkevt, 32768, 1, 0xffff);
>
--
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
WARNING: multiple messages have this Message-ID (diff)
From: Boris BREZILLON <boris.brezillon@free-electrons.com>
To: "Gaël PORTAY" <g.portay@overkiz.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org,
Nicolas Ferre <nicolas.ferre@atmel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Thierry Reding <thierry.reding@gmail.com>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Subject: Re: [PATCHv2 4/4] clocksource: tcb_clksrc: unprepare clock in case of failure
Date: Wed, 3 Sep 2014 12:10:15 +0200 [thread overview]
Message-ID: <20140903121015.2f756e4d@bbrezillon> (raw)
In-Reply-To: <1409329003-17252-5-git-send-email-g.portay@overkiz.com>
On Fri, 29 Aug 2014 18:16:43 +0200
Gaël PORTAY <g.portay@overkiz.com> wrote:
> The clock is not unprepared in case of the request IRQ fails.
>
> Also update to request_irq.
As you're doing 2 different things in this commit (first move to
request_irq and then disable the TC clk if the request fails) I would
have chosen another commit title, like
"clocksource: tcb_clksrc: sanitize IRQ request"
Otherwise, you have my
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
>
> Signed-off-by: Gaël PORTAY <g.portay@overkiz.com>
> ---
> drivers/clocksource/tcb_clksrc.c | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c
> index f922e81..8bdbc45 100644
> --- a/drivers/clocksource/tcb_clksrc.c
> +++ b/drivers/clocksource/tcb_clksrc.c
> @@ -178,12 +178,6 @@ static irqreturn_t ch2_irq(int irq, void *handle)
> return IRQ_NONE;
> }
>
> -static struct irqaction tc_irqaction = {
> - .name = "tc_clkevt",
> - .flags = IRQF_TIMER,
> - .handler = ch2_irq,
> -};
> -
> static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
> {
> int ret;
> @@ -198,15 +192,16 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
>
> clkevt.regs = tc->regs;
> clkevt.clk = t2_clk;
> - tc_irqaction.dev_id = &clkevt;
>
> timer_clock = clk32k_divisor_idx;
>
> clkevt.clkevt.cpumask = cpumask_of(0);
>
> - ret = setup_irq(irq, &tc_irqaction);
> - if (ret)
> + ret = request_irq(irq, ch2_irq, IRQF_TIMER, "tc_clkevt", &clkevt);
> + if (ret) {
> + clk_disable_unprepare(t2_clk);
> return ret;
> + }
>
> clockevents_config_and_register(&clkevt.clkevt, 32768, 1, 0xffff);
>
--
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
next prev parent reply other threads:[~2014-09-03 10:10 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-29 16:16 [PATCHv2 0/4] ARM: at91/tclib: fix segmentation fault Gaël PORTAY
2014-08-29 16:16 ` Gaël PORTAY
2014-08-29 16:16 ` Gaël PORTAY
2014-08-29 16:16 ` [PATCHv2 1/4] ARM: at91/tclib: prefer using of devm_* functions Gaël PORTAY
2014-08-29 16:16 ` Gaël PORTAY
2014-08-29 16:16 ` Gaël PORTAY
2014-08-29 16:16 ` [PATCHv2 2/4] ARM: at91/tclib: move initialization from alloc to probe Gaël PORTAY
2014-08-29 16:16 ` Gaël PORTAY
2014-08-29 16:16 ` Gaël PORTAY
2014-08-29 16:16 ` [PATCHv2 3/4] ARM: at91/tclib: mask interruptions at shutdown and probe Gaël PORTAY
2014-08-29 16:16 ` Gaël PORTAY
2014-08-29 16:16 ` Gaël PORTAY
2014-09-03 10:06 ` Boris BREZILLON
2014-09-03 10:06 ` Boris BREZILLON
2014-09-03 10:06 ` Boris BREZILLON
2014-08-29 16:16 ` [PATCHv2 4/4] clocksource: tcb_clksrc: unprepare clock in case of failure Gaël PORTAY
2014-08-29 16:16 ` Gaël PORTAY
2014-08-29 16:16 ` Gaël PORTAY
2014-09-03 9:49 ` Daniel Lezcano
2014-09-03 9:49 ` Daniel Lezcano
2014-09-03 10:10 ` Boris BREZILLON [this message]
2014-09-03 10:10 ` Boris BREZILLON
2014-09-03 10:10 ` Boris BREZILLON
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=20140903121015.2f756e4d@bbrezillon \
--to=boris.brezillon@free-electrons.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=arnd@arndb.de \
--cc=daniel.lezcano@linaro.org \
--cc=g.portay@overkiz.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=plagnioj@jcrosoft.com \
--cc=tglx@linutronix.de \
--cc=thierry.reding@gmail.com \
/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: link
Be 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.