Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus

[pandora-kernel.git] / arch / avr32 / mach-at32ap / pio.c

diff --git a/arch/avr32/mach-at32ap/pio.c b/arch/avr32/mach-at32ap/pio.c
index 3753410..9b39dea 100644 (file)
--- a/arch/avr32/mach-at32ap/pio.c
+++ b/arch/avr32/mach-at32ap/pio.c
@@ -257,7 +257,7 @@ static void gpio_irq_mask(struct irq_data *d)
        pio_writel(pio, IDR, 1 << (gpio & 0x1f));
 }
 
-static void gpio_irq_unmask(struct irq_data *d))
+static void gpio_irq_unmask(struct irq_data *d)
 {
        unsigned                gpio = irq_to_gpio(d->irq);
        struct pio_device       *pio = &pio_dev[gpio >> 5];
@@ -282,7 +282,7 @@ static struct irq_chip gpio_irqchip = {
 
 static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)
 {
-       struct pio_device       *pio = get_irq_desc_chip_data(desc);
+       struct pio_device       *pio = irq_desc_get_chip_data(desc);
        unsigned                gpio_irq;
 
        gpio_irq = (unsigned) irq_get_handler_data(irq);
@@ -461,7 +461,7 @@ void __init at32_init_pio(struct platform_device *pdev)
                clk_enable(pio->clk);
 
        pio->pdev = pdev;
-       pio->regs = ioremap(regs->start, regs->end - regs->start + 1);
+       pio->regs = ioremap(regs->start, resource_size(regs));
 
        /* start with irqs disabled and acked */
        pio_writel(pio, IDR, ~0UL);