ARM: VIC: remove unused irq_base variable

Commit Message

Arnd Bergmann Nov. 8, 2012, 1:40 p.m. UTC

"ARM: VIC: use irq_domain_add_simple()" causes a new warning:

arch/arm/common/vic.c: In function 'vic_of_init':
arch/arm/common/vic.c:410:6: warning: unused variable 'irq_base' [-Wunused-variable]

Since the irq_base variable is not used any more, it should be
removed now

Signed-off-by: Arnd Bergmann <[e-mail]>

---
On Tuesday 16 October 2012, Linus Walleij wrote:
> From: Linus Walleij <[e-mail]>
> 
> Instead of allocating descriptors on-the-fly for the device tree
> initialization case, use irq_domain_add_simple() which will take
> care of this if you pass negative as the first_irq.
> 
> Alter the signature of __vic_init() to pass the first_irq as
> signed so this works as expected.
> 
> Switching the VIC to use irq_domain_add_simple() also has the
> upside of displaying the same WARNING when you boot with
> pre-allocated descriptors on systems using SPARSE_IRQ but
> yet not using device tree.
> 
> Cc: Rob Herring <[e-mail]>
> Cc: Grant Likely <[e-mail]>
> Signed-off-by: Linus Walleij <[e-mail]>

Comments

Russell King - ARM Linux Nov. 8, 2012, 1:55 p.m. UTC | #1

On Thu, Nov 08, 2012 at 01:40:54PM +0000, Arnd Bergmann wrote:
> "ARM: VIC: use irq_domain_add_simple()" causes a new warning:
> 
> arch/arm/common/vic.c: In function 'vic_of_init':
> arch/arm/common/vic.c:410:6: warning: unused variable 'irq_base' [-Wunused-variable]
> 
> Since the irq_base variable is not used any more, it should be
> removed now

I've just committed exactly the same patch to my tree...

Linus Walleij Nov. 8, 2012, 2 p.m. UTC | #2

On Thu, Nov 8, 2012 at 2:55 PM, Russell King - ARM Linux
<[e-mail]> wrote:
> On Thu, Nov 08, 2012 at 01:40:54PM +0000, Arnd Bergmann wrote:
>> "ARM: VIC: use irq_domain_add_simple()" causes a new warning:
>>
>> arch/arm/common/vic.c: In function 'vic_of_init':
>> arch/arm/common/vic.c:410:6: warning: unused variable 'irq_base' [-Wunused-variable]
>>
>> Since the irq_base variable is not used any more, it should be
>> removed now
>
> I've just committed exactly the same patch to my tree...

Thanks guys...
Acked-by, FWIW

Yours,
Linus Walleij

Patch

diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index 4fd5d98..e4df17c 100644
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
@@ -407,7 +407,6 @@  void __init vic_init(void __iomem *base, unsigned int irq_start,
 int __init vic_of_init(struct device_node *node, struct device_node *parent)
 {
 	void __iomem *regs;
-	int irq_base;
 
 	if (WARN(parent, "non-root VICs are not supported"))
 		return -EINVAL;