Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[pandora-kernel.git] / arch / sh / kernel / cpu / irq / ipr.c

diff --git a/arch/sh/kernel/cpu/irq/ipr.c b/arch/sh/kernel/cpu/irq/ipr.c
index 9282d96..7516c35 100644 (file)
--- a/arch/sh/kernel/cpu/irq/ipr.c
+++ b/arch/sh/kernel/cpu/irq/ipr.c
@@ -24,25 +24,25 @@
 #include <linux/module.h>
 #include <linux/topology.h>
 
-static inline struct ipr_desc *get_ipr_desc(unsigned int irq)
+static inline struct ipr_desc *get_ipr_desc(struct irq_data *data)
 {
-       struct irq_chip *chip = get_irq_chip(irq);
+       struct irq_chip *chip = irq_data_get_irq_chip(data);
        return container_of(chip, struct ipr_desc, chip);
 }
 
-static void disable_ipr_irq(unsigned int irq)
+static void disable_ipr_irq(struct irq_data *data)
 {
-       struct ipr_data *p = get_irq_chip_data(irq);
-       unsigned long addr = get_ipr_desc(irq)->ipr_offsets[p->ipr_idx];
+       struct ipr_data *p = irq_data_get_irq_chip_data(data);
+       unsigned long addr = get_ipr_desc(data)->ipr_offsets[p->ipr_idx];
        /* Set the priority in IPR to 0 */
        __raw_writew(__raw_readw(addr) & (0xffff ^ (0xf << p->shift)), addr);
        (void)__raw_readw(addr);        /* Read back to flush write posting */
 }
 
-static void enable_ipr_irq(unsigned int irq)
+static void enable_ipr_irq(struct irq_data *data)
 {
-       struct ipr_data *p = get_irq_chip_data(irq);
-       unsigned long addr = get_ipr_desc(irq)->ipr_offsets[p->ipr_idx];
+       struct ipr_data *p = irq_data_get_irq_chip_data(data);
+       unsigned long addr = get_ipr_desc(data)->ipr_offsets[p->ipr_idx];
        /* Set priority in IPR back to original value */
        __raw_writew(__raw_readw(addr) | (p->priority << p->shift), addr);
 }
@@ -56,19 +56,18 @@ void register_ipr_controller(struct ipr_desc *desc)
 {
        int i;
 
-       desc->chip.mask = disable_ipr_irq;
-       desc->chip.unmask = enable_ipr_irq;
-       desc->chip.mask_ack = disable_ipr_irq;
+       desc->chip.irq_mask = disable_ipr_irq;
+       desc->chip.irq_unmask = enable_ipr_irq;
 
        for (i = 0; i < desc->nr_irqs; i++) {
                struct ipr_data *p = desc->ipr_data + i;
-               struct irq_desc *irq_desc;
+               int res;
 
                BUG_ON(p->ipr_idx >= desc->nr_offsets);
                BUG_ON(!desc->ipr_offsets[p->ipr_idx]);
 
-               irq_desc = irq_to_desc_alloc_node(p->irq, numa_node_id());
-               if (unlikely(!irq_desc)) {
+               res = irq_alloc_desc_at(p->irq, numa_node_id());
+               if (unlikely(res != p->irq && res != -EEXIST)) {
                        printk(KERN_INFO "can not get irq_desc for %d\n",
                               p->irq);
                        continue;
@@ -78,7 +77,7 @@ void register_ipr_controller(struct ipr_desc *desc)
                set_irq_chip_and_handler_name(p->irq, &desc->chip,
                                      handle_level_irq, "level");
                set_irq_chip_data(p->irq, p);
-               disable_ipr_irq(p->irq);
+               disable_ipr_irq(irq_get_irq_data(p->irq));
        }
 }
 EXPORT_SYMBOL(register_ipr_controller);