forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ht: Convert to new irq_chip functions

Browse source 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Thomas Gleixner 2010-09-28 17:22:09 +02:00
commit e9f7ac664b
3 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/kernel/apic/io_apic.c
View file

@ -3730,8 +3730,8 @@ static int set_ht_irq_affinity(unsigned int irq, const struct cpumask *mask)
static struct irq_chip ht_irq_chip = { static struct irq_chip ht_irq_chip = {
.name = "PCI-HT", .name = "PCI-HT",
.mask = mask_ht_irq, .irq_mask = mask_ht_irq,
.unmask = unmask_ht_irq, .irq_unmask = unmask_ht_irq,
.irq_ack = ack_apic_edge, .irq_ack = ack_apic_edge,
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
.set_affinity = set_ht_irq_affinity, .set_affinity = set_ht_irq_affinity,

22
drivers/pci/htirq.c
View file

@ -57,28 +57,22 @@ void fetch_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg)
*msg = cfg->msg; *msg = cfg->msg;
} }
void mask_ht_irq(unsigned int irq) void mask_ht_irq(struct irq_data *data)
{ {
struct ht_irq_cfg *cfg; struct ht_irq_cfg *cfg = irq_data_get_irq_data(data);
struct ht_irq_msg msg; struct ht_irq_msg msg = cfg->msg;
cfg = get_irq_data(irq);
msg = cfg->msg;
msg.address_lo |= 1; msg.address_lo |= 1;
write_ht_irq_msg(irq, &msg); write_ht_irq_msg(data->irq, &msg);
} }
void unmask_ht_irq(unsigned int irq) void unmask_ht_irq(struct irq_data *data)
{ {
struct ht_irq_cfg *cfg; struct ht_irq_cfg *cfg = irq_data_get_irq_data(data);
struct ht_irq_msg msg; struct ht_irq_msg msg = cfg->msg;
cfg = get_irq_data(irq);
msg = cfg->msg;
msg.address_lo &= ~1; msg.address_lo &= ~1;
write_ht_irq_msg(irq, &msg); write_ht_irq_msg(data->irq, &msg);
} }
/** /**

5
include/linux/htirq.h
View file

@ -9,8 +9,9 @@ struct ht_irq_msg {
/* Helper functions.. */ /* Helper functions.. */
void fetch_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg); void fetch_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg);
void write_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg); void write_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg);
void mask_ht_irq(unsigned int irq); struct irq_data;
void unmask_ht_irq(unsigned int irq); void mask_ht_irq(struct irq_data *data);
void unmask_ht_irq(struct irq_data *data);
/* The arch hook for getting things started */ /* The arch hook for getting things started */
int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev); int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev);