Commit cfeaa93f authored by Gerlando Falauto's avatar Gerlando Falauto Committed by Thomas Gleixner

genirq: Generic chip: Remove the local cur_regs() function

Since we already have an irq_data_get_chip_type() function which returns
a pointer to irq_chip_type, use that instead of cur_regs().
Signed-off-by: default avatarGerlando Falauto <gerlando.falauto@keymile.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Joey Oravec <joravec@drewtech.com>
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Cc: Holger Brunck <Holger.Brunck@keymile.com>
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: default avatarGrant Likely <grant.likely@linaro.org>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: devicetree-discuss@lists.ozlabs.org
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Simon Guinot <simon@sequanux.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Jean-Francois Moine <moinejf@free.fr>
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Rob Landley <rob@landley.net>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Link: http://lkml.kernel.org/r/20130506142539.010164766@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent e4aa937e
...@@ -16,11 +16,6 @@ ...@@ -16,11 +16,6 @@
static LIST_HEAD(gc_list); static LIST_HEAD(gc_list);
static DEFINE_RAW_SPINLOCK(gc_lock); static DEFINE_RAW_SPINLOCK(gc_lock);
static inline struct irq_chip_regs *cur_regs(struct irq_data *d)
{
return &container_of(d->chip, struct irq_chip_type, chip)->regs;
}
/** /**
* irq_gc_noop - NOOP function * irq_gc_noop - NOOP function
* @d: irq_data * @d: irq_data
...@@ -39,10 +34,11 @@ void irq_gc_noop(struct irq_data *d) ...@@ -39,10 +34,11 @@ void irq_gc_noop(struct irq_data *d)
void irq_gc_mask_disable_reg(struct irq_data *d) void irq_gc_mask_disable_reg(struct irq_data *d)
{ {
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
struct irq_chip_type *ct = irq_data_get_chip_type(d);
u32 mask = 1 << (d->irq - gc->irq_base); u32 mask = 1 << (d->irq - gc->irq_base);
irq_gc_lock(gc); irq_gc_lock(gc);
irq_reg_writel(mask, gc->reg_base + cur_regs(d)->disable); irq_reg_writel(mask, gc->reg_base + ct->regs.disable);
gc->mask_cache &= ~mask; gc->mask_cache &= ~mask;
irq_gc_unlock(gc); irq_gc_unlock(gc);
} }
...@@ -57,11 +53,12 @@ void irq_gc_mask_disable_reg(struct irq_data *d) ...@@ -57,11 +53,12 @@ void irq_gc_mask_disable_reg(struct irq_data *d)
void irq_gc_mask_set_bit(struct irq_data *d) void irq_gc_mask_set_bit(struct irq_data *d)
{ {
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
struct irq_chip_type *ct = irq_data_get_chip_type(d);
u32 mask = 1 << (d->irq - gc->irq_base); u32 mask = 1 << (d->irq - gc->irq_base);
irq_gc_lock(gc); irq_gc_lock(gc);
gc->mask_cache |= mask; gc->mask_cache |= mask;
irq_reg_writel(gc->mask_cache, gc->reg_base + cur_regs(d)->mask); irq_reg_writel(gc->mask_cache, gc->reg_base + ct->regs.mask);
irq_gc_unlock(gc); irq_gc_unlock(gc);
} }
...@@ -75,11 +72,12 @@ void irq_gc_mask_set_bit(struct irq_data *d) ...@@ -75,11 +72,12 @@ void irq_gc_mask_set_bit(struct irq_data *d)
void irq_gc_mask_clr_bit(struct irq_data *d) void irq_gc_mask_clr_bit(struct irq_data *d)
{ {
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
struct irq_chip_type *ct = irq_data_get_chip_type(d);
u32 mask = 1 << (d->irq - gc->irq_base); u32 mask = 1 << (d->irq - gc->irq_base);
irq_gc_lock(gc); irq_gc_lock(gc);
gc->mask_cache &= ~mask; gc->mask_cache &= ~mask;
irq_reg_writel(gc->mask_cache, gc->reg_base + cur_regs(d)->mask); irq_reg_writel(gc->mask_cache, gc->reg_base + ct->regs.mask);
irq_gc_unlock(gc); irq_gc_unlock(gc);
} }
...@@ -93,10 +91,11 @@ void irq_gc_mask_clr_bit(struct irq_data *d) ...@@ -93,10 +91,11 @@ void irq_gc_mask_clr_bit(struct irq_data *d)
void irq_gc_unmask_enable_reg(struct irq_data *d) void irq_gc_unmask_enable_reg(struct irq_data *d)
{ {
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
struct irq_chip_type *ct = irq_data_get_chip_type(d);
u32 mask = 1 << (d->irq - gc->irq_base); u32 mask = 1 << (d->irq - gc->irq_base);
irq_gc_lock(gc); irq_gc_lock(gc);
irq_reg_writel(mask, gc->reg_base + cur_regs(d)->enable); irq_reg_writel(mask, gc->reg_base + ct->regs.enable);
gc->mask_cache |= mask; gc->mask_cache |= mask;
irq_gc_unlock(gc); irq_gc_unlock(gc);
} }
...@@ -108,10 +107,11 @@ void irq_gc_unmask_enable_reg(struct irq_data *d) ...@@ -108,10 +107,11 @@ void irq_gc_unmask_enable_reg(struct irq_data *d)
void irq_gc_ack_set_bit(struct irq_data *d) void irq_gc_ack_set_bit(struct irq_data *d)
{ {
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
struct irq_chip_type *ct = irq_data_get_chip_type(d);
u32 mask = 1 << (d->irq - gc->irq_base); u32 mask = 1 << (d->irq - gc->irq_base);
irq_gc_lock(gc); irq_gc_lock(gc);
irq_reg_writel(mask, gc->reg_base + cur_regs(d)->ack); irq_reg_writel(mask, gc->reg_base + ct->regs.ack);
irq_gc_unlock(gc); irq_gc_unlock(gc);
} }
...@@ -122,10 +122,11 @@ void irq_gc_ack_set_bit(struct irq_data *d) ...@@ -122,10 +122,11 @@ void irq_gc_ack_set_bit(struct irq_data *d)
void irq_gc_ack_clr_bit(struct irq_data *d) void irq_gc_ack_clr_bit(struct irq_data *d)
{ {
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
struct irq_chip_type *ct = irq_data_get_chip_type(d);
u32 mask = ~(1 << (d->irq - gc->irq_base)); u32 mask = ~(1 << (d->irq - gc->irq_base));
irq_gc_lock(gc); irq_gc_lock(gc);
irq_reg_writel(mask, gc->reg_base + cur_regs(d)->ack); irq_reg_writel(mask, gc->reg_base + ct->regs.ack);
irq_gc_unlock(gc); irq_gc_unlock(gc);
} }
...@@ -136,11 +137,12 @@ void irq_gc_ack_clr_bit(struct irq_data *d) ...@@ -136,11 +137,12 @@ void irq_gc_ack_clr_bit(struct irq_data *d)
void irq_gc_mask_disable_reg_and_ack(struct irq_data *d) void irq_gc_mask_disable_reg_and_ack(struct irq_data *d)
{ {
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
struct irq_chip_type *ct = irq_data_get_chip_type(d);
u32 mask = 1 << (d->irq - gc->irq_base); u32 mask = 1 << (d->irq - gc->irq_base);
irq_gc_lock(gc); irq_gc_lock(gc);
irq_reg_writel(mask, gc->reg_base + cur_regs(d)->mask); irq_reg_writel(mask, gc->reg_base + ct->regs.mask);
irq_reg_writel(mask, gc->reg_base + cur_regs(d)->ack); irq_reg_writel(mask, gc->reg_base + ct->regs.ack);
irq_gc_unlock(gc); irq_gc_unlock(gc);
} }
...@@ -151,10 +153,11 @@ void irq_gc_mask_disable_reg_and_ack(struct irq_data *d) ...@@ -151,10 +153,11 @@ void irq_gc_mask_disable_reg_and_ack(struct irq_data *d)
void irq_gc_eoi(struct irq_data *d) void irq_gc_eoi(struct irq_data *d)
{ {
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
struct irq_chip_type *ct = irq_data_get_chip_type(d);
u32 mask = 1 << (d->irq - gc->irq_base); u32 mask = 1 << (d->irq - gc->irq_base);
irq_gc_lock(gc); irq_gc_lock(gc);
irq_reg_writel(mask, gc->reg_base + cur_regs(d)->eoi); irq_reg_writel(mask, gc->reg_base + ct->regs.eoi);
irq_gc_unlock(gc); irq_gc_unlock(gc);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment