← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/pci/htirq.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:
drivers/pci/htirq.c
34
34
 
35
35
void write_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg)
36
36
{
37
 
        struct ht_irq_cfg *cfg = get_irq_data(irq);
 
37
        struct ht_irq_cfg *cfg = irq_get_handler_data(irq);
38
38
        unsigned long flags;
39
39
        spin_lock_irqsave(&ht_irq_lock, flags);
40
40
        if (cfg->msg.address_lo != msg->address_lo) {
53
53
 
54
54
void fetch_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg)
55
55
{
56
 
        struct ht_irq_cfg *cfg = get_irq_data(irq);
 
56
        struct ht_irq_cfg *cfg = irq_get_handler_data(irq);
57
57
        *msg = cfg->msg;
58
58
}
59
59
 
60
60
void mask_ht_irq(struct irq_data *data)
61
61
{
62
 
        struct ht_irq_cfg *cfg = irq_data_get_irq_data(data);
 
62
        struct ht_irq_cfg *cfg = irq_data_get_irq_handler_data(data);
63
63
        struct ht_irq_msg msg = cfg->msg;
64
64
 
65
65
        msg.address_lo |= 1;
68
68
 
69
69
void unmask_ht_irq(struct irq_data *data)
70
70
{
71
 
        struct ht_irq_cfg *cfg = irq_data_get_irq_data(data);
 
71
        struct ht_irq_cfg *cfg = irq_data_get_irq_handler_data(data);
72
72
        struct ht_irq_msg msg = cfg->msg;
73
73
 
74
74
        msg.address_lo &= ~1;
126
126
                kfree(cfg);
127
127
                return -EBUSY;
128
128
        }
129
 
        set_irq_data(irq, cfg);
 
129
        irq_set_handler_data(irq, cfg);
130
130
 
131
131
        if (arch_setup_ht_irq(irq, dev) < 0) {
132
132
                ht_destroy_irq(irq);
162
162
{
163
163
        struct ht_irq_cfg *cfg;
164
164
 
165
 
        cfg = get_irq_data(irq);
166
 
        set_irq_chip(irq, NULL);
167
 
        set_irq_data(irq, NULL);
 
165
        cfg = irq_get_handler_data(irq);
 
166
        irq_set_chip(irq, NULL);
 
167
        irq_set_handler_data(irq, NULL);
168
168
        destroy_irq(irq);
169
169
 
170
170
        kfree(cfg);