← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/arm/plat-spear/shirq.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/plat-spear/shirq.c
68
68
static void shirq_handler(unsigned irq, struct irq_desc *desc)
69
69
{
70
70
        u32 i, val, mask;
71
 
        struct spear_shirq *shirq = get_irq_data(irq);
 
71
        struct spear_shirq *shirq = irq_get_handler_data(irq);
72
72
 
73
73
        desc->irq_data.chip->irq_ack(&desc->irq_data);
74
74
        while ((val = readl(shirq->regs.base + shirq->regs.status_reg) &
105
105
        if (!shirq->dev_count)
106
106
                return -EINVAL;
107
107
 
108
 
        set_irq_chained_handler(shirq->irq, shirq_handler);
 
108
        irq_set_chained_handler(shirq->irq, shirq_handler);
109
109
        for (i = 0; i < shirq->dev_count; i++) {
110
 
                set_irq_chip(shirq->dev_config[i].virq, &shirq_chip);
111
 
                set_irq_handler(shirq->dev_config[i].virq, handle_simple_irq);
 
110
                irq_set_chip_and_handler(shirq->dev_config[i].virq,
 
111
                                         &shirq_chip, handle_simple_irq);
112
112
                set_irq_flags(shirq->dev_config[i].virq, IRQF_VALID);
113
 
                set_irq_chip_data(shirq->dev_config[i].virq, shirq);
 
113
                irq_set_chip_data(shirq->dev_config[i].virq, shirq);
114
114
        }
115
115
 
116
 
        set_irq_data(shirq->irq, shirq);
 
116
        irq_set_handler_data(shirq->irq, shirq);
117
117
        return 0;
118
118
}