3 files changed, 13 insertions, 13 deletions

diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c
index dd2947342604..69130f365904 100644
--- a/arch/arm/common/dmabounce.c
+++ b/arch/arm/common/dmabounce.c
@@ -280,7 +280,7 @@ unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
         /*
          * Trying to unmap an invalid mapping
          */
-        if (dma_mapping_error(dma_addr)) {
+        if (dma_mapping_error(dev, dma_addr)) {
                 dev_err(dev, "Trying to unmap invalid mapping\n");
                 return;
         }
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index c3c3a3339049..85579654d3b7 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -331,17 +331,17 @@ static int locomo_gpio_type(unsigned int irq, unsigned int type)
 
         mask = 1 << (irq - LOCOMO_IRQ_GPIO_START);
 
-        if (type == IRQT_PROBE) {
+        if (type == IRQ_TYPE_PROBE) {
                 if ((GPIO_IRQ_rising_edge | GPIO_IRQ_falling_edge) & mask)
                         return 0;
-                type = __IRQT_RISEDGE | __IRQT_FALEDGE;
+                type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
         }
 
-        if (type & __IRQT_RISEDGE)
+        if (type & IRQ_TYPE_EDGE_RISING)
                 GPIO_IRQ_rising_edge |= mask;
         else
                 GPIO_IRQ_rising_edge &= ~mask;
-        if (type & __IRQT_FALEDGE)
+        if (type & IRQ_TYPE_EDGE_FALLING)
                 GPIO_IRQ_falling_edge |= mask;
         else
                 GPIO_IRQ_falling_edge &= ~mask;
@@ -473,7 +473,7 @@ static void locomo_setup_irq(struct locomo *lchip)
         /*
          * Install handler for IRQ_LOCOMO_HW.
          */
-        set_irq_type(lchip->irq, IRQT_FALLING);
+        set_irq_type(lchip->irq, IRQ_TYPE_EDGE_FALLING);
         set_irq_chip_data(lchip->irq, irqbase);
         set_irq_chained_handler(lchip->irq, locomo_handler);
 
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 0a8e1ff2af8a..f6d3fdda7067 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -241,14 +241,14 @@ static int sa1111_type_lowirq(unsigned int irq, unsigned int flags)
         void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ip0;
 
-        if (flags == IRQT_PROBE)
+        if (flags == IRQ_TYPE_PROBE)
                 return 0;
 
-        if ((!(flags & __IRQT_RISEDGE) ^ !(flags & __IRQT_FALEDGE)) == 0)
+        if ((!(flags & IRQ_TYPE_EDGE_RISING) ^ !(flags & IRQ_TYPE_EDGE_FALLING)) == 0)
                 return -EINVAL;
 
         ip0 = sa1111_readl(mapbase + SA1111_INTPOL0);
-        if (flags & __IRQT_RISEDGE)
+        if (flags & IRQ_TYPE_EDGE_RISING)
                 ip0 &= ~mask;
         else
                 ip0 |= mask;
@@ -338,14 +338,14 @@ static int sa1111_type_highirq(unsigned int irq, unsigned int flags)
         void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ip1;
 
-        if (flags == IRQT_PROBE)
+        if (flags == IRQ_TYPE_PROBE)
                 return 0;
 
-        if ((!(flags & __IRQT_RISEDGE) ^ !(flags & __IRQT_FALEDGE)) == 0)
+        if ((!(flags & IRQ_TYPE_EDGE_RISING) ^ !(flags & IRQ_TYPE_EDGE_FALLING)) == 0)
                 return -EINVAL;
 
         ip1 = sa1111_readl(mapbase + SA1111_INTPOL1);
-        if (flags & __IRQT_RISEDGE)
+        if (flags & IRQ_TYPE_EDGE_RISING)
                 ip1 &= ~mask;
         else
                 ip1 |= mask;
@@ -427,7 +427,7 @@ static void sa1111_setup_irq(struct sa1111 *sachip)
         /*
          * Register SA1111 interrupt
          */
-        set_irq_type(sachip->irq, IRQT_RISING);
+        set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING);
         set_irq_data(sachip->irq, irqbase);
         set_irq_chained_handler(sachip->irq, sa1111_irq_handler);
 }