Skip to contentSkip to conversation

ARM: pxa: Remove unused variables

PATCH Applied Thierry Reding 3 participants 3 messages Dec 4, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: pxa: Remove unused variables

The conf and of_id variables are assigned but never used, so they may as well just be removed.

---
 arch/arm/mach-pxa/irq.c | 4 ----
 1 file changed, 4 deletions(-)
arch/arm/mach-pxa/irq.c +0 -4
index b6cc1816463e..0eecd83c624e 100644
@@ -235,8 +235,6 @@ static const struct of_device_id intc_ids[] __initconst = {
 void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
 {
 	struct device_node *node;
-	const struct of_device_id *of_id;
-	struct pxa_intc_conf *conf;
 	struct resource res;
 	int n, ret;
 
@@ -245,8 +243,6 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
 		pr_err("Failed to find interrupt controller in arch-pxa\n");
 		return;
 	}
-	of_id = of_match_node(intc_ids, node);
-	conf = of_id->data;
 
 	ret = of_property_read_u32(node, "marvell,intc-nr-irqs",
 				   &pxa_internal_irq_nr);
Signature · 1 line
1.8.4.2
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Thierry Reding

The conf and of_id variables are assigned but never used, so they may as well just be removed.

Quoted 27 lines
---
 arch/arm/mach-pxa/irq.c | 4 ----
 1 file changed, 4 deletions(-)
arch/arm/mach-pxa/irq.c +0 -4
index b6cc1816463e..0eecd83c624e 100644
@@ -235,8 +235,6 @@ static const struct of_device_id intc_ids[] __initconst = {
 void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
 {
 	struct device_node *node;
-	const struct of_device_id *of_id;
-	struct pxa_intc_conf *conf;
 	struct resource res;
 	int n, ret;
 
@@ -245,8 +243,6 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
 		pr_err("Failed to find interrupt controller in arch-pxa\n");
 		return;
 	}
-	of_id = of_match_node(intc_ids, node);
-	conf = of_id->data;
 
 	ret = of_property_read_u32(node, "marvell,intc-nr-irqs",
 				   &pxa_internal_irq_nr);
maintainer Applied
#2 lore raw
Quoted 32 lines · Daniel Mack
Quoted 4 lines · Thierry Reding

The conf and of_id variables are assigned but never used, so they may as well just be removed.

Quoted 24 lines
---
 arch/arm/mach-pxa/irq.c | 4 ----
 1 file changed, 4 deletions(-)
arch/arm/mach-pxa/irq.c +0 -4
index b6cc1816463e..0eecd83c624e 100644
@@ -235,8 +235,6 @@ static const struct of_device_id intc_ids[] __initconst = {
 void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
 {
      struct device_node *node;
-     const struct of_device_id *of_id;
-     struct pxa_intc_conf *conf;
      struct resource res;
      int n, ret;
 
@@ -245,8 +243,6 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
              pr_err("Failed to find interrupt controller in arch-pxa\n");
              return;
      }
-     of_id = of_match_node(intc_ids, node);
-     conf = of_id->data;
 
Quoted 4 lines

arch/arm/mach-pxa/irq.c void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int)) · line 248

Quoted 3 lines
arch/arm/mach-pxa/irq.c +0 -0
      ret = of_property_read_u32(node, "marvell,intc-nr-irqs",
                                 &pxa_internal_irq_nr);

Applied.

Thanks
Haojian