* [PATCH v2 1/2] irqchip/renesas-intc-irqpin: Remove obsolete platform data support
2015-11-24 14:49 [PATCH v2 0/2] irqchip/renesas-intc-irqpin: Remove obsolete platform data support Geert Uytterhoeven
@ 2015-11-24 14:49 ` Geert Uytterhoeven
2015-11-24 14:49 ` [PATCH v2 2/2] irqchip/renesas-intc-irqpin: Remove intc_irqpin_priv.number_of_irqs Geert Uytterhoeven
2015-11-24 16:56 ` [PATCH v2 0/2] irqchip/renesas-intc-irqpin: Remove obsolete platform data support Jason Cooper
2 siblings, 0 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2015-11-24 14:49 UTC (permalink / raw)
To: Thomas Gleixner, Jason Cooper, Marc Zyngier
Cc: linux-kernel, linux-sh, Geert Uytterhoeven
Since commit 4baadb9e05c68962 ("ARM: shmobile: r8a7778: remove obsolete
setup code"), all Renesas SoCs with a renesas-intc-irqpin module are
only supported in generic DT-only ARM multi-platform builds. The driver
doesn't need to use platform data anymore, hence remove platform data
configuration.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
---
Commit 4baadb9e05c68962 is now in arm-soc/for-next.
v2:
- Add Acked-by.
---
drivers/irqchip/irq-renesas-intc-irqpin.c | 38 +++++++---------------
.../linux/platform_data/irq-renesas-intc-irqpin.h | 29 -----------------
2 files changed, 12 insertions(+), 55 deletions(-)
delete mode 100644 include/linux/platform_data/irq-renesas-intc-irqpin.h
diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
index c325806561bedd93..7aefa500d210bf5e 100644
--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
@@ -31,7 +31,6 @@
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/of_device.h>
-#include <linux/platform_data/irq-renesas-intc-irqpin.h>
#include <linux/pm_runtime.h>
#define INTC_IRQPIN_MAX 8 /* maximum 8 interrupts per driver instance */
@@ -75,7 +74,7 @@ struct intc_irqpin_irq {
struct intc_irqpin_priv {
struct intc_irqpin_iomem iomem[INTC_IRQPIN_REG_NR];
struct intc_irqpin_irq irq[INTC_IRQPIN_MAX];
- struct renesas_intc_irqpin_config config;
+ unsigned int sense_bitfield_width;
unsigned int number_of_irqs;
struct platform_device *pdev;
struct irq_chip irq_chip;
@@ -171,7 +170,7 @@ static void intc_irqpin_mask_unmask_prio(struct intc_irqpin_priv *p,
static int intc_irqpin_set_sense(struct intc_irqpin_priv *p, int irq, int value)
{
/* The SENSE register is assumed to be 32-bit. */
- int bitfield_width = p->config.sense_bitfield_width;
+ int bitfield_width = p->sense_bitfield_width;
int shift = 32 - (irq + 1) * bitfield_width;
dev_dbg(&p->pdev->dev, "sense irq = %d, mode = %d\n", irq, value);
@@ -378,7 +377,6 @@ MODULE_DEVICE_TABLE(of, intc_irqpin_dt_ids);
static int intc_irqpin_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
- struct renesas_intc_irqpin_config *pdata = dev->platform_data;
const struct of_device_id *of_id;
struct intc_irqpin_priv *p;
struct intc_irqpin_iomem *i;
@@ -388,6 +386,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
void (*enable_fn)(struct irq_data *d);
void (*disable_fn)(struct irq_data *d);
const char *name = dev_name(dev);
+ bool control_parent;
int ref_irq;
int ret;
int k;
@@ -399,16 +398,11 @@ static int intc_irqpin_probe(struct platform_device *pdev)
}
/* deal with driver instance configuration */
- if (pdata) {
- memcpy(&p->config, pdata, sizeof(*pdata));
- } else {
- of_property_read_u32(dev->of_node, "sense-bitfield-width",
- &p->config.sense_bitfield_width);
- p->config.control_parent = of_property_read_bool(dev->of_node,
- "control-parent");
- }
- if (!p->config.sense_bitfield_width)
- p->config.sense_bitfield_width = 4; /* default to 4 bits */
+ of_property_read_u32(dev->of_node, "sense-bitfield-width",
+ &p->sense_bitfield_width);
+ control_parent = of_property_read_bool(dev->of_node, "control-parent");
+ if (!p->sense_bitfield_width)
+ p->sense_bitfield_width = 4; /* default to 4 bits */
p->pdev = pdev;
platform_set_drvdata(pdev, p);
@@ -515,7 +509,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
}
/* use more severe masking method if requested */
- if (p->config.control_parent) {
+ if (control_parent) {
enable_fn = intc_irqpin_irq_enable_force;
disable_fn = intc_irqpin_irq_disable_force;
} else if (!p->shared_irqs) {
@@ -534,10 +528,9 @@ static int intc_irqpin_probe(struct platform_device *pdev)
irq_chip->irq_set_wake = intc_irqpin_irq_set_wake;
irq_chip->flags = IRQCHIP_MASK_ON_SUSPEND;
- p->irq_domain = irq_domain_add_simple(dev->of_node,
- p->number_of_irqs,
- p->config.irq_base,
- &intc_irqpin_irq_domain_ops, p);
+ p->irq_domain = irq_domain_add_simple(dev->of_node, p->number_of_irqs,
+ 0, &intc_irqpin_irq_domain_ops,
+ p);
if (!p->irq_domain) {
ret = -ENXIO;
dev_err(dev, "cannot initialize irq domain\n");
@@ -572,13 +565,6 @@ static int intc_irqpin_probe(struct platform_device *pdev)
dev_info(dev, "driving %d irqs\n", p->number_of_irqs);
- /* warn in case of mismatch if irq base is specified */
- if (p->config.irq_base) {
- if (p->config.irq_base != p->irq[0].domain_irq)
- dev_warn(dev, "irq base mismatch (%d/%d)\n",
- p->config.irq_base, p->irq[0].domain_irq);
- }
-
return 0;
err1:
diff --git a/include/linux/platform_data/irq-renesas-intc-irqpin.h b/include/linux/platform_data/irq-renesas-intc-irqpin.h
deleted file mode 100644
index e4cb911066a62c9e..0000000000000000
--- a/include/linux/platform_data/irq-renesas-intc-irqpin.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Renesas INTC External IRQ Pin Driver
- *
- * Copyright (C) 2013 Magnus Damm
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __IRQ_RENESAS_INTC_IRQPIN_H__
-#define __IRQ_RENESAS_INTC_IRQPIN_H__
-
-struct renesas_intc_irqpin_config {
- unsigned int sense_bitfield_width;
- unsigned int irq_base;
- bool control_parent;
-};
-
-#endif /* __IRQ_RENESAS_INTC_IRQPIN_H__ */
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v2 2/2] irqchip/renesas-intc-irqpin: Remove intc_irqpin_priv.number_of_irqs
2015-11-24 14:49 [PATCH v2 0/2] irqchip/renesas-intc-irqpin: Remove obsolete platform data support Geert Uytterhoeven
2015-11-24 14:49 ` [PATCH v2 1/2] " Geert Uytterhoeven
@ 2015-11-24 14:49 ` Geert Uytterhoeven
2015-11-24 16:56 ` [PATCH v2 0/2] irqchip/renesas-intc-irqpin: Remove obsolete platform data support Jason Cooper
2 siblings, 0 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2015-11-24 14:49 UTC (permalink / raw)
To: Thomas Gleixner, Jason Cooper, Marc Zyngier
Cc: linux-kernel, linux-sh, Geert Uytterhoeven
intc_irqpin_priv.number_of_irqs is used inside intc_irqpin_probe() only,
so it can just become a local variable.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
---
v2:
- Add Acked-by.
---
drivers/irqchip/irq-renesas-intc-irqpin.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
index 7aefa500d210bf5e..7f6cf19aa6ac00d7 100644
--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
@@ -75,7 +75,6 @@ struct intc_irqpin_priv {
struct intc_irqpin_iomem iomem[INTC_IRQPIN_REG_NR];
struct intc_irqpin_irq irq[INTC_IRQPIN_MAX];
unsigned int sense_bitfield_width;
- unsigned int number_of_irqs;
struct platform_device *pdev;
struct irq_chip irq_chip;
struct irq_domain *irq_domain;
@@ -387,6 +386,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
void (*disable_fn)(struct irq_data *d);
const char *name = dev_name(dev);
bool control_parent;
+ unsigned int nirqs;
int ref_irq;
int ret;
int k;
@@ -437,8 +437,8 @@ static int intc_irqpin_probe(struct platform_device *pdev)
p->irq[k].requested_irq = irq->start;
}
- p->number_of_irqs = k;
- if (p->number_of_irqs < 1) {
+ nirqs = k;
+ if (nirqs < 1) {
dev_err(dev, "not enough IRQ resources\n");
ret = -EINVAL;
goto err0;
@@ -492,7 +492,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
}
/* mask all interrupts using priority */
- for (k = 0; k < p->number_of_irqs; k++)
+ for (k = 0; k < nirqs; k++)
intc_irqpin_mask_unmask_prio(p, k, 1);
/* clear all pending interrupts */
@@ -501,7 +501,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
/* scan for shared interrupt lines */
ref_irq = p->irq[0].requested_irq;
p->shared_irqs = true;
- for (k = 1; k < p->number_of_irqs; k++) {
+ for (k = 1; k < nirqs; k++) {
if (ref_irq != p->irq[k].requested_irq) {
p->shared_irqs = false;
break;
@@ -528,9 +528,8 @@ static int intc_irqpin_probe(struct platform_device *pdev)
irq_chip->irq_set_wake = intc_irqpin_irq_set_wake;
irq_chip->flags = IRQCHIP_MASK_ON_SUSPEND;
- p->irq_domain = irq_domain_add_simple(dev->of_node, p->number_of_irqs,
- 0, &intc_irqpin_irq_domain_ops,
- p);
+ p->irq_domain = irq_domain_add_simple(dev->of_node, nirqs, 0,
+ &intc_irqpin_irq_domain_ops, p);
if (!p->irq_domain) {
ret = -ENXIO;
dev_err(dev, "cannot initialize irq domain\n");
@@ -548,7 +547,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
}
} else {
/* request interrupts one by one */
- for (k = 0; k < p->number_of_irqs; k++) {
+ for (k = 0; k < nirqs; k++) {
if (devm_request_irq(dev, p->irq[k].requested_irq,
intc_irqpin_irq_handler, 0, name,
&p->irq[k])) {
@@ -560,10 +559,10 @@ static int intc_irqpin_probe(struct platform_device *pdev)
}
/* unmask all interrupts on prio level */
- for (k = 0; k < p->number_of_irqs; k++)
+ for (k = 0; k < nirqs; k++)
intc_irqpin_mask_unmask_prio(p, k, 0);
- dev_info(dev, "driving %d irqs\n", p->number_of_irqs);
+ dev_info(dev, "driving %d irqs\n", nirqs);
return 0;
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2 0/2] irqchip/renesas-intc-irqpin: Remove obsolete platform data support
2015-11-24 14:49 [PATCH v2 0/2] irqchip/renesas-intc-irqpin: Remove obsolete platform data support Geert Uytterhoeven
2015-11-24 14:49 ` [PATCH v2 1/2] " Geert Uytterhoeven
2015-11-24 14:49 ` [PATCH v2 2/2] irqchip/renesas-intc-irqpin: Remove intc_irqpin_priv.number_of_irqs Geert Uytterhoeven
@ 2015-11-24 16:56 ` Jason Cooper
2 siblings, 0 replies; 4+ messages in thread
From: Jason Cooper @ 2015-11-24 16:56 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Thomas Gleixner, Marc Zyngier, linux-kernel, linux-sh
Hi Geert,
On Tue, Nov 24, 2015 at 03:49:39PM +0100, Geert Uytterhoeven wrote:
> Hi Thomas, Jason, Marc,
>
> Since commit 4baadb9e05c68962 ("ARM: shmobile: r8a7778: remove obsolete
> setup code"), which is now in v4.4-rc1, all Renesas SoCs with a
> renesas-intc-irqpin module are only supported in generic DT-only ARM
> multi-platform builds. The driver doesn't need to use platform data anymore,
> hence this series removes platform data configuration, and does a small
> cleanup.
>
> Changes since v1:
> - Add Acked-by,
> - Platform dependency has entered mainline.
>
> Thanks for applying!
>
> Geert Uytterhoeven (2):
> irqchip/renesas-intc-irqpin: Remove obsolete platform data support
> irqchip/renesas-intc-irqpin: Remove intc_irqpin_priv.number_of_irqs
>
> drivers/irqchip/irq-renesas-intc-irqpin.c | 51 ++++++++--------------
> .../linux/platform_data/irq-renesas-intc-irqpin.h | 29 ------------
> 2 files changed, 18 insertions(+), 62 deletions(-)
> delete mode 100644 include/linux/platform_data/irq-renesas-intc-irqpin.h
Applied to irqchip/core
thx,
Jason.
^ permalink raw reply [flat|nested] 4+ messages in thread