Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86: lguest: Convert to new irq chip functions

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
Cc: Rusty Russell <rusty@rustcorp.com.au>

+7 -7
+7 -7
arch/x86/lguest/boot.c
··· 791 791 * simple as setting a bit. We don't actually "ack" interrupts as such, we 792 792 * just mask and unmask them. I wonder if we should be cleverer? 793 793 */ 794 - static void disable_lguest_irq(unsigned int irq) 794 + static void disable_lguest_irq(struct irq_data *data) 795 795 { 796 - set_bit(irq, lguest_data.blocked_interrupts); 796 + set_bit(data->irq, lguest_data.blocked_interrupts); 797 797 } 798 798 799 - static void enable_lguest_irq(unsigned int irq) 799 + static void enable_lguest_irq(struct irq_data *data) 800 800 { 801 - clear_bit(irq, lguest_data.blocked_interrupts); 801 + clear_bit(data->irq, lguest_data.blocked_interrupts); 802 802 } 803 803 804 804 /* This structure describes the lguest IRQ controller. */ 805 805 static struct irq_chip lguest_irq_controller = { 806 806 .name = "lguest", 807 - .mask = disable_lguest_irq, 808 - .mask_ack = disable_lguest_irq, 809 - .unmask = enable_lguest_irq, 807 + .irq_mask = disable_lguest_irq, 808 + .irq_mask_ack = disable_lguest_irq, 809 + .irq_unmask = enable_lguest_irq, 810 810 }; 811 811 812 812 /*