Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43a6246f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: visws: Fixup irq overhaul fallout 



Reported-by: default avatarIan Campbell <Ian.Campbell@eu.citrix.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 818987e9

arch/x86/platform/visws/visws_quirks.c

+6 −14
Original line number Diff line number Diff line
@@ -471,15 +471,7 @@ static unsigned int startup_piix4_master_irq(struct irq_data *data) 
{

	legacy_pic->init(0);

	enable_cobalt_irq(data);

}



static void end_piix4_master_irq(struct irq_data *data)

{

	unsigned long flags;



	spin_lock_irqsave(&cobalt_lock, flags);

	enable_cobalt_irq(data);

	spin_unlock_irqrestore(&cobalt_lock, flags);

	return 0;

}



static struct irq_chip piix4_master_irq_type = {
@@ -492,7 +484,7 @@ static void pii4_mask(struct irq_data *data) { } 


static struct irq_chip piix4_virtual_irq_type = {

	.name		= "PIIX4-virtual",

	.mask		= pii4_mask,

	.irq_mask	= pii4_mask,

};



/*
@@ -580,9 +572,9 @@ static struct irqaction cascade_action = { 


static inline void set_piix4_virtual_irq_type(void)

{

	piix4_virtual_irq_type.enable =	i8259A_chip.unmask;

	piix4_virtual_irq_type.disable = i8259A_chip.mask;

	piix4_virtual_irq_type.unmask =	i8259A_chip.unmask;

	piix4_virtual_irq_type.irq_enable = i8259A_chip.irq_unmask;

	piix4_virtual_irq_type.irq_disable = i8259A_chip.irq_mask;

	piix4_virtual_irq_type.irq_unmask = i8259A_chip.irq_unmask;

}



static void __init visws_pre_intr_init(void)
@@ -599,7 +591,7 @@ static void __init visws_pre_intr_init(void) 
		else if (i == CO_IRQ_IDE0)

			chip = &cobalt_irq_type;

		else if (i == CO_IRQ_IDE1)

			>chip = &cobalt_irq_type;

			chip = &cobalt_irq_type;

		else if (i == CO_IRQ_8259)

			chip = &piix4_master_irq_type;

		else if (i < CO_IRQ_APIC0)