diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-03-15 10:43:04 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-21 17:05:51 -0500 |
commit | 548153663bbf33ca7c244a6bbddd82c26a17c331 (patch) | |
tree | a524672721340c2c937deb7db25955230f478d96 /arch/arm/mach-at91rm9200 | |
parent | 5d25ac038a317d454a4321cba955f756400835a5 (diff) |
[ARM] Rename chipdata to 'base' and make it an iomem pointer
In all current use cases, "chipdata" is used to store an iomem address.
Mark it with __iomem, and rename it to 'base'. Leave the accessor macros
alone.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-at91rm9200')
-rw-r--r-- | arch/arm/mach-at91rm9200/gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91rm9200/gpio.c b/arch/arm/mach-at91rm9200/gpio.c index 0e396feec468..5ab46274e1a3 100644 --- a/arch/arm/mach-at91rm9200/gpio.c +++ b/arch/arm/mach-at91rm9200/gpio.c | |||
@@ -261,7 +261,7 @@ static void gpio_irq_handler(unsigned irq, struct irqdesc *desc, struct pt_regs | |||
261 | void __iomem *pio; | 261 | void __iomem *pio; |
262 | u32 isr; | 262 | u32 isr; |
263 | 263 | ||
264 | pio = (void __force __iomem *) desc->chipdata; | 264 | pio = desc->base; |
265 | 265 | ||
266 | /* temporarily mask (level sensitive) parent IRQ */ | 266 | /* temporarily mask (level sensitive) parent IRQ */ |
267 | desc->chip->ack(irq); | 267 | desc->chip->ack(irq); |
@@ -312,7 +312,7 @@ void __init at91_gpio_irq_setup(unsigned banks) | |||
312 | __raw_writel(~0, controller + PIO_IDR); | 312 | __raw_writel(~0, controller + PIO_IDR); |
313 | 313 | ||
314 | set_irq_data(id, (void *) pin); | 314 | set_irq_data(id, (void *) pin); |
315 | set_irq_chipdata(id, (void __force *) controller); | 315 | set_irq_chipdata(id, controller); |
316 | 316 | ||
317 | for (i = 0; i < 32; i++, pin++) { | 317 | for (i = 0; i < 32; i++, pin++) { |
318 | set_irq_chip(pin, &gpio_irqchip); | 318 | set_irq_chip(pin, &gpio_irqchip); |