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

Commit c90c10c8 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Matt Turner
Browse files

alpha: sable: Convert irq_chip functions 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarMatt Turner <mattst88@gmail.com>
parent 2758a8af

arch/alpha/kernel/sys_sable.c

+10 −10
Original line number Diff line number Diff line
@@ -443,11 +443,11 @@ lynx_swizzle(struct pci_dev *dev, u8 *pinp) 
/* GENERIC irq routines */



static inline void

sable_lynx_enable_irq(unsigned int irq)

sable_lynx_enable_irq(struct irq_data *d)

{

	unsigned long bit, mask;



	bit = sable_lynx_irq_swizzle->irq_to_mask[irq];

	bit = sable_lynx_irq_swizzle->irq_to_mask[d->irq];

	spin_lock(&sable_lynx_irq_lock);

	mask = sable_lynx_irq_swizzle->shadow_mask &= ~(1UL << bit);

	sable_lynx_irq_swizzle->update_irq_hw(bit, mask);
@@ -459,11 +459,11 @@ sable_lynx_enable_irq(unsigned int irq) 
}



static void

sable_lynx_disable_irq(unsigned int irq)

sable_lynx_disable_irq(struct irq_data *d)

{

	unsigned long bit, mask;



	bit = sable_lynx_irq_swizzle->irq_to_mask[irq];

	bit = sable_lynx_irq_swizzle->irq_to_mask[d->irq];

	spin_lock(&sable_lynx_irq_lock);

	mask = sable_lynx_irq_swizzle->shadow_mask |= 1UL << bit;

	sable_lynx_irq_swizzle->update_irq_hw(bit, mask);
@@ -475,11 +475,11 @@ sable_lynx_disable_irq(unsigned int irq) 
}



static void

sable_lynx_mask_and_ack_irq(unsigned int irq)

sable_lynx_mask_and_ack_irq(struct irq_data *d)

{

	unsigned long bit, mask;



	bit = sable_lynx_irq_swizzle->irq_to_mask[irq];

	bit = sable_lynx_irq_swizzle->irq_to_mask[d->irq];

	spin_lock(&sable_lynx_irq_lock);

	mask = sable_lynx_irq_swizzle->shadow_mask |= 1UL << bit;

	sable_lynx_irq_swizzle->update_irq_hw(bit, mask);
@@ -489,9 +489,9 @@ sable_lynx_mask_and_ack_irq(unsigned int irq) 


static struct irq_chip sable_lynx_irq_type = {

	.name		= "SABLE/LYNX",

	.unmask		= sable_lynx_enable_irq,

	.mask		= sable_lynx_disable_irq,

	.mask_ack	= sable_lynx_mask_and_ack_irq,

	.irq_unmask	= sable_lynx_enable_irq,

	.irq_mask	= sable_lynx_disable_irq,

	.irq_mask_ack	= sable_lynx_mask_and_ack_irq,

};



static void
@@ -518,9 +518,9 @@ sable_lynx_init_irq(int nr_of_irqs) 
	long i;



	for (i = 0; i < nr_of_irqs; ++i) {

		irq_to_desc(i)->status |= IRQ_LEVEL;

		set_irq_chip_and_handler(i, &sable_lynx_irq_type,

			handle_level_irq);

		irq_set_status_flags(i, IRQ_LEVEL);

	}



	common_init_isa_dma();