← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/pci/htirq.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/pci/htirq.c
10
10
#include <linux/pci.h>
11
11
#include <linux/spinlock.h>
12
12
#include <linux/slab.h>
13
 
#include <linux/gfp.h>
14
13
#include <linux/htirq.h>
15
14
 
16
15
/* Global ht irq lock.
58
57
        *msg = cfg->msg;
59
58
}
60
59
 
61
 
void mask_ht_irq(unsigned int irq)
 
60
void mask_ht_irq(struct irq_data *data)
62
61
{
63
 
        struct ht_irq_cfg *cfg;
64
 
        struct ht_irq_msg msg;
65
 
 
66
 
        cfg = get_irq_data(irq);
67
 
 
68
 
        msg = cfg->msg;
 
62
        struct ht_irq_cfg *cfg = irq_data_get_irq_data(data);
 
63
        struct ht_irq_msg msg = cfg->msg;
 
64
 
69
65
        msg.address_lo |= 1;
70
 
        write_ht_irq_msg(irq, &msg);
 
66
        write_ht_irq_msg(data->irq, &msg);
71
67
}
72
68
 
73
 
void unmask_ht_irq(unsigned int irq)
 
69
void unmask_ht_irq(struct irq_data *data)
74
70
{
75
 
        struct ht_irq_cfg *cfg;
76
 
        struct ht_irq_msg msg;
77
 
 
78
 
        cfg = get_irq_data(irq);
79
 
 
80
 
        msg = cfg->msg;
 
71
        struct ht_irq_cfg *cfg = irq_data_get_irq_data(data);
 
72
        struct ht_irq_msg msg = cfg->msg;
 
73
 
81
74
        msg.address_lo &= ~1;
82
 
        write_ht_irq_msg(irq, &msg);
 
75
        write_ht_irq_msg(data->irq, &msg);
83
76
}
84
77
 
85
78
/**