evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86/irq: Use accessor irq_data_get_node()

Browse source 
Use accessor irq_data_get_node() to hide struct irq_data
implementation detail, so we can move node to irq_data_common later.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Jiang Liu 2015-06-01 16:05:14 +08:00 • committed by Thomas Gleixner
parent e49251988b
commit 5f2dbbc517
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/x86/kernel/apic/vector.c
View file

@ -296,7 +296,7 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq,
struct irq_alloc_info *info = arg; struct irq_alloc_info *info = arg;
struct apic_chip_data *data; struct apic_chip_data *data;
struct irq_data *irq_data; struct irq_data *irq_data;
int i, err; int i, err, node;
if (disable_apic) if (disable_apic)
return -ENXIO; return -ENXIO;
@ -308,12 +308,13 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq,
for (i = 0; i < nr_irqs; i++) { for (i = 0; i < nr_irqs; i++) {
irq_data = irq_domain_get_irq_data(domain, virq + i); irq_data = irq_domain_get_irq_data(domain, virq + i);
BUG_ON(!irq_data); BUG_ON(!irq_data);
node = irq_data_get_node(irq_data);
#ifdef CONFIG_X86_IO_APIC #ifdef CONFIG_X86_IO_APIC
if (virq + i < nr_legacy_irqs() && legacy_irq_data[virq + i]) if (virq + i < nr_legacy_irqs() && legacy_irq_data[virq + i])
data = legacy_irq_data[virq + i]; data = legacy_irq_data[virq + i];
else else
#endif #endif
data = alloc_apic_chip_data(irq_data->node); data = alloc_apic_chip_data(node);
if (!data) { if (!data) {
err = -ENOMEM; err = -ENOMEM;
goto error; goto error;
@ -322,8 +323,7 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq,
irq_data->chip = &lapic_controller; irq_data->chip = &lapic_controller;
irq_data->chip_data = data; irq_data->chip_data = data;
irq_data->hwirq = virq + i; irq_data->hwirq = virq + i;
err = assign_irq_vector_policy(virq, irq_data->node, data, err = assign_irq_vector_policy(virq, node, data, info);
info);
if (err) if (err)
goto error; goto error;
} }

2
arch/x86/platform/uv/uv_irq.c
View file

@ -89,7 +89,7 @@ static int uv_domain_alloc(struct irq_domain *domain, unsigned int virq,
return -EINVAL; return -EINVAL;
chip_data = kmalloc_node(sizeof(*chip_data), GFP_KERNEL, chip_data = kmalloc_node(sizeof(*chip_data), GFP_KERNEL,
irq_data->node); irq_data_get_node(irq_data));
if (!chip_data) if (!chip_data)
return -ENOMEM; return -ENOMEM;