Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1521879 > unrolled thread
| Started by | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> |
|---|---|
| First post | 2016-11-14 18:20 +0100 |
| Last post | 2016-11-22 17:10 +0100 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 3/3] mfd: arizona: Use arizona_map_irq instead of hard coding it Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2016-11-14 18:20 +0100
Re: [PATCH 3/3] mfd: arizona: Use arizona_map_irq instead of hard coding it Lee Jones <lee.jones@linaro.org> - 2016-11-22 14:00 +0100
Re: [PATCH 3/3] mfd: arizona: Use arizona_map_irq instead of hard coding it Lee Jones <lee.jones@linaro.org> - 2016-11-22 17:00 +0100
Re: [PATCH 3/3] mfd: arizona: Use arizona_map_irq instead of hard coding it Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2016-11-22 17:10 +0100
| From | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> |
|---|---|
| Date | 2016-11-14 18:20 +0100 |
| Subject | [PATCH 3/3] mfd: arizona: Use arizona_map_irq instead of hard coding it |
| Message-ID | <sDt5f-1sT-9@gated-at.bofh.it> |
We have arizona_map_irq we might as well use it rather than hard coding
it in several places.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
drivers/mfd/arizona-irq.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c
index bc3b342..22f96c9 100644
--- a/drivers/mfd/arizona-irq.c
+++ b/drivers/mfd/arizona-irq.c
@@ -204,7 +204,7 @@ static const struct irq_domain_ops arizona_domain_ops = {
int arizona_irq_init(struct arizona *arizona)
{
int flags = IRQF_ONESHOT;
- int ret, i;
+ int ret;
const struct regmap_irq_chip *aod, *irq;
struct irq_data *irq_data;
unsigned int virq;
@@ -379,9 +379,8 @@ int arizona_irq_init(struct arizona *arizona)
}
/* Make sure the boot done IRQ is unmasked for resumes */
- i = arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE);
- ret = request_threaded_irq(i, NULL, arizona_boot_done, IRQF_ONESHOT,
- "Boot done", arizona);
+ ret = arizona_request_irq(arizona, ARIZONA_IRQ_BOOT_DONE, "Boot done",
+ arizona_boot_done, arizona);
if (ret != 0) {
dev_err(arizona->dev, "Failed to request boot done %d: %d\n",
arizona->irq, ret);
@@ -390,10 +389,9 @@ int arizona_irq_init(struct arizona *arizona)
/* Handle control interface errors in the core */
if (arizona->ctrlif_error) {
- i = arizona_map_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR);
- ret = request_threaded_irq(i, NULL, arizona_ctrlif_err,
- IRQF_ONESHOT,
- "Control interface error", arizona);
+ ret = arizona_request_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR,
+ "Control interface error",
+ arizona_ctrlif_err, arizona);
if (ret != 0) {
dev_err(arizona->dev,
"Failed to request CTRLIF_ERR %d: %d\n",
@@ -405,7 +403,7 @@ int arizona_irq_init(struct arizona *arizona)
return 0;
err_ctrlif:
- free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE), arizona);
+ arizona_free_irq(arizona, ARIZONA_IRQ_BOOT_DONE, arizona);
err_boot_done:
free_irq(arizona->irq, arizona);
err_main_irq:
@@ -429,9 +427,8 @@ int arizona_irq_exit(struct arizona *arizona)
unsigned int virq;
if (arizona->ctrlif_error)
- free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR),
- arizona);
- free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE), arizona);
+ arizona_free_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR, arizona);
+ arizona_free_irq(arizona, ARIZONA_IRQ_BOOT_DONE, arizona);
virq = irq_find_mapping(arizona->virq, 1);
regmap_del_irq_chip(virq, arizona->irq_chip);
--
2.1.4
[toc] | [next] | [standalone]
| From | Lee Jones <lee.jones@linaro.org> |
|---|---|
| Date | 2016-11-22 14:00 +0100 |
| Subject | Re: [PATCH 3/3] mfd: arizona: Use arizona_map_irq instead of hard coding it |
| Message-ID | <sGiQ2-7g9-23@gated-at.bofh.it> |
| In reply to | #1521879 |
On Mon, 14 Nov 2016, Charles Keepax wrote:
> We have arizona_map_irq we might as well use it rather than hard coding
> it in several places.
>
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/arizona-irq.c | 21 +++++++++------------
> 1 file changed, 9 insertions(+), 12 deletions(-)
Applied, thanks.
> diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c
> index bc3b342..22f96c9 100644
> --- a/drivers/mfd/arizona-irq.c
> +++ b/drivers/mfd/arizona-irq.c
> @@ -204,7 +204,7 @@ static const struct irq_domain_ops arizona_domain_ops = {
> int arizona_irq_init(struct arizona *arizona)
> {
> int flags = IRQF_ONESHOT;
> - int ret, i;
> + int ret;
> const struct regmap_irq_chip *aod, *irq;
> struct irq_data *irq_data;
> unsigned int virq;
> @@ -379,9 +379,8 @@ int arizona_irq_init(struct arizona *arizona)
> }
>
> /* Make sure the boot done IRQ is unmasked for resumes */
> - i = arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE);
> - ret = request_threaded_irq(i, NULL, arizona_boot_done, IRQF_ONESHOT,
> - "Boot done", arizona);
> + ret = arizona_request_irq(arizona, ARIZONA_IRQ_BOOT_DONE, "Boot done",
> + arizona_boot_done, arizona);
> if (ret != 0) {
> dev_err(arizona->dev, "Failed to request boot done %d: %d\n",
> arizona->irq, ret);
> @@ -390,10 +389,9 @@ int arizona_irq_init(struct arizona *arizona)
>
> /* Handle control interface errors in the core */
> if (arizona->ctrlif_error) {
> - i = arizona_map_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR);
> - ret = request_threaded_irq(i, NULL, arizona_ctrlif_err,
> - IRQF_ONESHOT,
> - "Control interface error", arizona);
> + ret = arizona_request_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR,
> + "Control interface error",
> + arizona_ctrlif_err, arizona);
> if (ret != 0) {
> dev_err(arizona->dev,
> "Failed to request CTRLIF_ERR %d: %d\n",
> @@ -405,7 +403,7 @@ int arizona_irq_init(struct arizona *arizona)
> return 0;
>
> err_ctrlif:
> - free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE), arizona);
> + arizona_free_irq(arizona, ARIZONA_IRQ_BOOT_DONE, arizona);
> err_boot_done:
> free_irq(arizona->irq, arizona);
> err_main_irq:
> @@ -429,9 +427,8 @@ int arizona_irq_exit(struct arizona *arizona)
> unsigned int virq;
>
> if (arizona->ctrlif_error)
> - free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR),
> - arizona);
> - free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE), arizona);
> + arizona_free_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR, arizona);
> + arizona_free_irq(arizona, ARIZONA_IRQ_BOOT_DONE, arizona);
>
> virq = irq_find_mapping(arizona->virq, 1);
> regmap_del_irq_chip(virq, arizona->irq_chip);
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
[toc] | [prev] | [next] | [standalone]
| From | Lee Jones <lee.jones@linaro.org> |
|---|---|
| Date | 2016-11-22 17:00 +0100 |
| Subject | Re: [PATCH 3/3] mfd: arizona: Use arizona_map_irq instead of hard coding it |
| Message-ID | <sGlEf-BN-35@gated-at.bofh.it> |
| In reply to | #1527488 |
On Tue, 22 Nov 2016, Lee Jones wrote:
> On Mon, 14 Nov 2016, Charles Keepax wrote:
>
> > We have arizona_map_irq we might as well use it rather than hard coding
> > it in several places.
> >
> > Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> > ---
> > drivers/mfd/arizona-irq.c | 21 +++++++++------------
> > 1 file changed, 9 insertions(+), 12 deletions(-)
>
> Applied, thanks.
Slight change of plan.
Patch doesn't seem to apply.
Please rebase it on top of my MFD tree and resubmit.
> > diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c
> > index bc3b342..22f96c9 100644
> > --- a/drivers/mfd/arizona-irq.c
> > +++ b/drivers/mfd/arizona-irq.c
> > @@ -204,7 +204,7 @@ static const struct irq_domain_ops arizona_domain_ops = {
> > int arizona_irq_init(struct arizona *arizona)
> > {
> > int flags = IRQF_ONESHOT;
> > - int ret, i;
> > + int ret;
> > const struct regmap_irq_chip *aod, *irq;
> > struct irq_data *irq_data;
> > unsigned int virq;
> > @@ -379,9 +379,8 @@ int arizona_irq_init(struct arizona *arizona)
> > }
> >
> > /* Make sure the boot done IRQ is unmasked for resumes */
> > - i = arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE);
> > - ret = request_threaded_irq(i, NULL, arizona_boot_done, IRQF_ONESHOT,
> > - "Boot done", arizona);
> > + ret = arizona_request_irq(arizona, ARIZONA_IRQ_BOOT_DONE, "Boot done",
> > + arizona_boot_done, arizona);
> > if (ret != 0) {
> > dev_err(arizona->dev, "Failed to request boot done %d: %d\n",
> > arizona->irq, ret);
> > @@ -390,10 +389,9 @@ int arizona_irq_init(struct arizona *arizona)
> >
> > /* Handle control interface errors in the core */
> > if (arizona->ctrlif_error) {
> > - i = arizona_map_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR);
> > - ret = request_threaded_irq(i, NULL, arizona_ctrlif_err,
> > - IRQF_ONESHOT,
> > - "Control interface error", arizona);
> > + ret = arizona_request_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR,
> > + "Control interface error",
> > + arizona_ctrlif_err, arizona);
> > if (ret != 0) {
> > dev_err(arizona->dev,
> > "Failed to request CTRLIF_ERR %d: %d\n",
> > @@ -405,7 +403,7 @@ int arizona_irq_init(struct arizona *arizona)
> > return 0;
> >
> > err_ctrlif:
> > - free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE), arizona);
> > + arizona_free_irq(arizona, ARIZONA_IRQ_BOOT_DONE, arizona);
> > err_boot_done:
> > free_irq(arizona->irq, arizona);
> > err_main_irq:
> > @@ -429,9 +427,8 @@ int arizona_irq_exit(struct arizona *arizona)
> > unsigned int virq;
> >
> > if (arizona->ctrlif_error)
> > - free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR),
> > - arizona);
> > - free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE), arizona);
> > + arizona_free_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR, arizona);
> > + arizona_free_irq(arizona, ARIZONA_IRQ_BOOT_DONE, arizona);
> >
> > virq = irq_find_mapping(arizona->virq, 1);
> > regmap_del_irq_chip(virq, arizona->irq_chip);
>
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
[toc] | [prev] | [next] | [standalone]
| From | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> |
|---|---|
| Date | 2016-11-22 17:10 +0100 |
| Subject | Re: [PATCH 3/3] mfd: arizona: Use arizona_map_irq instead of hard coding it |
| Message-ID | <sGlNT-Wt-3@gated-at.bofh.it> |
| In reply to | #1527631 |
On Tue, Nov 22, 2016 at 03:54:36PM +0000, Lee Jones wrote: > On Tue, 22 Nov 2016, Lee Jones wrote: > > > On Mon, 14 Nov 2016, Charles Keepax wrote: > > > > > We have arizona_map_irq we might as well use it rather than hard coding > > > it in several places. > > > > > > Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> > > > --- > > > drivers/mfd/arizona-irq.c | 21 +++++++++------------ > > > 1 file changed, 9 insertions(+), 12 deletions(-) > > > > Applied, thanks. > > Slight change of plan. > > Patch doesn't seem to apply. > > Please rebase it on top of my MFD tree and resubmit. > Yeah depends on the first patch, ignore the ones I just sent (since I had assumed you fixed that up manually) and I will resend the whole series. Thanks, Charles
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web