Commit 32f5ef5d authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner
Browse files

x86, ioapic: Use irq_cfg() instead of irq_get_chip_data() for better readability 



Use defined helper function irq_cfg() instead of irq_get_chip_data() for
better readability.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1402302011-23642-15-git-send-email-jiang.liu@linux.intel.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent f44d1692

arch/x86/kernel/apic/io_apic.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -230,7 +230,7 @@ int __init arch_early_irq_init(void) 
	return 0;

	return 0;

}

}





static struct irq_cfg *irq_cfg(unsigned int irq)

static inline struct irq_cfg *irq_cfg(unsigned int irq)

{

{

	return irq_get_chip_data(irq);

	return irq_get_chip_data(irq);

}

}
@@ -272,7 +272,7 @@ static struct irq_cfg *alloc_irq_and_cfg_at(unsigned int at, int node) 
	if (res < 0) {

	if (res < 0) {

		if (res != -EEXIST)

		if (res != -EEXIST)

			return NULL;

			return NULL;

		cfg = irq_get_chip_data(at);

		cfg = irq_cfg(at);

		if (cfg)

		if (cfg)

			return cfg;

			return cfg;

	}

	}
@@ -1204,7 +1204,7 @@ void __setup_vector_irq(int cpu) 
	raw_spin_lock(&vector_lock);

	raw_spin_lock(&vector_lock);

	/* Mark the inuse vectors */

	/* Mark the inuse vectors */

	for_each_active_irq(irq) {

	for_each_active_irq(irq) {

		cfg = irq_get_chip_data(irq);

		cfg = irq_cfg(irq);

		if (!cfg)

		if (!cfg)

			continue;

			continue;
@@ -1612,7 +1612,7 @@ __apicdebuginit(void) print_IO_APICs(void) 
		if (chip != &ioapic_chip)

		if (chip != &ioapic_chip)

			continue;

			continue;





		cfg = irq_get_chip_data(irq);

		cfg = irq_cfg(irq);

		if (!cfg)

		if (!cfg)

			continue;

			continue;

		entry = cfg->irq_2_pin;

		entry = cfg->irq_2_pin;
@@ -2253,7 +2253,7 @@ static void irq_complete_move(struct irq_cfg *cfg) 




void irq_force_complete_move(int irq)

void irq_force_complete_move(int irq)

{

{

	struct irq_cfg *cfg = irq_get_chip_data(irq);

	struct irq_cfg *cfg = irq_cfg(irq);





	if (!cfg)

	if (!cfg)

		return;

		return;
@@ -2515,7 +2515,7 @@ static inline void init_IO_APIC_traps(void) 
	unsigned int irq;

	unsigned int irq;





	for_each_active_irq(irq) {

	for_each_active_irq(irq) {

		cfg = irq_get_chip_data(irq);

		cfg = irq_cfg(irq);

		if (IO_APIC_IRQ(irq) && cfg && !cfg->vector) {

		if (IO_APIC_IRQ(irq) && cfg && !cfg->vector) {

			/*

			/*

			 * Hmm.. We don't have an entry for this,

			 * Hmm.. We don't have an entry for this,
@@ -2648,7 +2648,7 @@ early_param("disable_timer_pin_1", disable_timer_pin_setup); 
 */

 */

static inline void __init check_timer(void)

static inline void __init check_timer(void)

{

{

	struct irq_cfg *cfg = irq_get_chip_data(0);

	struct irq_cfg *cfg = irq_cfg(0);

	int node = cpu_to_node(0);

	int node = cpu_to_node(0);

	int apic1, pin1, apic2, pin2;

	int apic1, pin1, apic2, pin2;

	unsigned long flags;

	unsigned long flags;
@@ -2912,7 +2912,7 @@ int arch_setup_hwirq(unsigned int irq, int node) 




void arch_teardown_hwirq(unsigned int irq)

void arch_teardown_hwirq(unsigned int irq)

{

{

	struct irq_cfg *cfg = irq_get_chip_data(irq);

	struct irq_cfg *cfg = irq_cfg(irq);

	unsigned long flags;

	unsigned long flags;





	free_remapped_irq(irq);

	free_remapped_irq(irq);
@@ -3039,7 +3039,7 @@ int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, 
	if (!irq_offset)

	if (!irq_offset)

		write_msi_msg(irq, &msg);

		write_msi_msg(irq, &msg);





	setup_remapped_irq(irq, irq_get_chip_data(irq), chip);

	setup_remapped_irq(irq, irq_cfg(irq), chip);





	irq_set_chip_and_handler_name(irq, chip, handle_edge_irq, "edge");

	irq_set_chip_and_handler_name(irq, chip, handle_edge_irq, "edge");
@@ -3178,7 +3178,7 @@ int default_setup_hpet_msi(unsigned int irq, unsigned int id) 




	hpet_msi_write(irq_get_handler_data(irq), &msg);

	hpet_msi_write(irq_get_handler_data(irq), &msg);

	irq_set_status_flags(irq, IRQ_MOVE_PCNTXT);

	irq_set_status_flags(irq, IRQ_MOVE_PCNTXT);

	setup_remapped_irq(irq, irq_get_chip_data(irq), chip);

	setup_remapped_irq(irq, irq_cfg(irq), chip);





	irq_set_chip_and_handler_name(irq, chip, handle_edge_irq, "edge");

	irq_set_chip_and_handler_name(irq, chip, handle_edge_irq, "edge");

	return 0;

	return 0;