1 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index d973c986f72..85579654d3b 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);
 
@@ -543,7 +543,6 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info)
                 goto out;
         }
 
-        strncpy(dev->dev.bus_id, info->name, sizeof(dev->dev.bus_id));
         /*
          * If the parent device has a DMA mask associated with it,
          * propagate it down to the children.
@@ -553,6 +552,7 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info)
                 dev->dev.dma_mask = &dev->dma_mask;
         }
 
+        dev_set_name(&dev->dev, "%s", info->name);
         dev->devid       = info->devid;
         dev->dev.parent  = lchip->dev;
         dev->dev.bus     = &locomo_bus_type;