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

Commit 7801907b authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Change irq_chip wake/type methods to set_wake/set_type 



This is part of Thomas Gleixner's generic IRQ patch, which converts
ARM to use the generic IRQ subsystem.  Here, we rename two of the
irq_chip methods - wake becomes set_wake, and type becomes set_type.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e24da5d3

arch/arm/common/sa1111.c

+4 −4
Original line number Diff line number Diff line
@@ -268,8 +268,8 @@ static struct irqchip sa1111_low_chip = { 
	.mask		= sa1111_mask_lowirq,

	.unmask		= sa1111_unmask_lowirq,

	.retrigger	= sa1111_retrigger_lowirq,

	.type		= sa1111_type_lowirq,

	.wake		= sa1111_wake_lowirq,

	.set_type	= sa1111_type_lowirq,

	.set_wake	= sa1111_wake_lowirq,

};



static void sa1111_mask_highirq(unsigned int irq)
@@ -364,8 +364,8 @@ static struct irqchip sa1111_high_chip = { 
	.mask		= sa1111_mask_highirq,

	.unmask		= sa1111_unmask_highirq,

	.retrigger	= sa1111_retrigger_highirq,

	.type		= sa1111_type_highirq,

	.wake		= sa1111_wake_highirq,

	.set_type	= sa1111_type_highirq,

	.set_wake	= sa1111_wake_highirq,

};



static void sa1111_setup_irq(struct sa1111 *sachip)

arch/arm/kernel/irq.c

+8 −8
Original line number Diff line number Diff line
@@ -207,8 +207,8 @@ void enable_irq_wake(unsigned int irq) 
	unsigned long flags;



	spin_lock_irqsave(&irq_controller_lock, flags);

	if (desc->chip->wake)

		desc->chip->wake(irq, 1);

	if (desc->chip->set_wake)

		desc->chip->set_wake(irq, 1);

	spin_unlock_irqrestore(&irq_controller_lock, flags);

}

EXPORT_SYMBOL(enable_irq_wake);
@@ -219,8 +219,8 @@ void disable_irq_wake(unsigned int irq) 
	unsigned long flags;



	spin_lock_irqsave(&irq_controller_lock, flags);

	if (desc->chip->wake)

		desc->chip->wake(irq, 0);

	if (desc->chip->set_wake)

		desc->chip->set_wake(irq, 0);

	spin_unlock_irqrestore(&irq_controller_lock, flags);

}

EXPORT_SYMBOL(disable_irq_wake);
@@ -624,9 +624,9 @@ int set_irq_type(unsigned int irq, unsigned int type) 
	}



	desc = irq_desc + irq;

	if (desc->chip->type) {

	if (desc->chip->set_type) {

		spin_lock_irqsave(&irq_controller_lock, flags);

		ret = desc->chip->type(irq, type);

		ret = desc->chip->set_type(irq, type);

		spin_unlock_irqrestore(&irq_controller_lock, flags);

	}
@@ -846,8 +846,8 @@ unsigned long probe_irq_on(void) 


		irq_desc[i].probing = 1;

		irq_desc[i].triggered = 0;

		if (irq_desc[i].chip->type)

			irq_desc[i].chip->type(i, IRQT_PROBE);

		if (irq_desc[i].chip->set_type)

			irq_desc[i].chip->set_type(i, IRQT_PROBE);

		irq_desc[i].chip->unmask(i);

		irqs += 1;

	}

arch/arm/mach-imx/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static struct irqchip imx_gpio_chip = { 
	.ack = imx_gpio_ack_irq,

	.mask = imx_gpio_mask_irq,

	.unmask = imx_gpio_unmask_irq,

	.type = imx_gpio_irq_type,

	.set_type = imx_gpio_irq_type,

};



void __init

arch/arm/mach-ixp2000/core.c

+4 −4
Original line number Diff line number Diff line
@@ -380,10 +380,10 @@ static void ixp2000_GPIO_irq_unmask(unsigned int irq) 
}



static struct irqchip ixp2000_GPIO_irq_chip = {

	.type	= ixp2000_GPIO_irq_type,

	.ack		= ixp2000_GPIO_irq_mask_ack,

	.mask		= ixp2000_GPIO_irq_mask,

	.unmask		= ixp2000_GPIO_irq_unmask

	.set_type	= ixp2000_GPIO_irq_type,

};



static void ixp2000_pci_irq_mask(unsigned int irq)

arch/arm/mach-pxa/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static struct irqchip pxa_low_gpio_chip = { 
	.ack		= pxa_ack_low_gpio,

	.mask		= pxa_mask_low_irq,

	.unmask		= pxa_unmask_low_irq,

	.type		= pxa_gpio_irq_type,

	.set_type	= pxa_gpio_irq_type,

};



/*
@@ -241,7 +241,7 @@ static struct irqchip pxa_muxed_gpio_chip = { 
	.ack		= pxa_ack_muxed_gpio,

	.mask		= pxa_mask_muxed_gpio,

	.unmask		= pxa_unmask_muxed_gpio,

	.type		= pxa_gpio_irq_type,

	.set_type	= pxa_gpio_irq_type,

};