Commit e9f7ac66 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

ht: Convert to new irq_chip functions 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
parent 5c2837fb

arch/x86/kernel/apic/io_apic.c

+2 −2
Original line number Diff line number Diff line
@@ -3730,8 +3730,8 @@ static int set_ht_irq_affinity(unsigned int irq, const struct cpumask *mask) 


static struct irq_chip ht_irq_chip = {

	.name		= "PCI-HT",

	.mask		= mask_ht_irq,

	.unmask		= unmask_ht_irq,

	.irq_mask	= mask_ht_irq,

	.irq_unmask	= unmask_ht_irq,

	.irq_ack	= ack_apic_edge,

#ifdef CONFIG_SMP

	.set_affinity	= set_ht_irq_affinity,

drivers/pci/htirq.c

+8 −14
Original line number Diff line number Diff line
@@ -57,28 +57,22 @@ void fetch_ht_irq_msg(unsigned int irq, struct ht_irq_msg *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_msg msg;



	cfg = get_irq_data(irq);

	struct ht_irq_cfg *cfg = irq_data_get_irq_data(data);

	struct ht_irq_msg msg = cfg->msg;



	msg = cfg->msg;

	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_msg msg;



	cfg = get_irq_data(irq);

	struct ht_irq_cfg *cfg = irq_data_get_irq_data(data);

	struct ht_irq_msg msg = cfg->msg;



	msg = cfg->msg;

	msg.address_lo &= ~1;

	write_ht_irq_msg(irq, &msg);

	write_ht_irq_msg(data->irq, &msg);

}



/**

include/linux/htirq.h

+3 −2
Original line number Diff line number Diff line
@@ -9,8 +9,9 @@ struct ht_irq_msg { 
/* Helper functions.. */

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 mask_ht_irq(unsigned int irq);

void unmask_ht_irq(unsigned int irq);

struct irq_data;

void mask_ht_irq(struct irq_data *data);

void unmask_ht_irq(struct irq_data *data);



/* The arch hook for getting things started */

int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev);