Commit f7e8bbb8 authored by Deepak Saxena's avatar Deepak Saxena Committed by Russell King
Browse files

[ARM] 3192/1: Remove gpio_isr_line_clear() API from IXP4xx 



Patch from Deepak Saxena

Other than interrupt masking purposes, this API is only used when
configuring interrupt lines and this patch moves that functionality
directly into the ixp4xx_set_irq_type() implementation as board level
PCI code should not need to worry about those details.

Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b3a96245

arch/arm/mach-ixp4xx/common.c

+3 −1
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type) 
	*int_reg &= ~(IXP4XX_GPIO_STYLE_CLEAR <<

	    		(line * IXP4XX_GPIO_STYLE_SIZE));



	*IXP4XX_GPIO_GPISR = (1 << line);



	/* Set the new style */

	*int_reg |= (int_style << (line * IXP4XX_GPIO_STYLE_SIZE));
@@ -169,7 +171,7 @@ static void ixp4xx_irq_ack(unsigned int irq) 
	int line = (irq < 32) ? irq2gpio[irq] : -1;



	if (line >= 0)

		gpio_line_isr_clear(line);

		*IXP4XX_GPIO_GPISR = (1 << line);

}



/*

arch/arm/mach-ixp4xx/coyote-pci.c

+0 −3
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ void __init coyote_pci_preinit(void) 
	set_irq_type(IRQ_COYOTE_PCI_SLOT0, IRQT_LOW);

	set_irq_type(IRQ_COYOTE_PCI_SLOT1, IRQT_LOW);



	gpio_line_isr_clear(COYOTE_PCI_SLOT0_PIN);

	gpio_line_isr_clear(COYOTE_PCI_SLOT1_PIN);



	ixp4xx_pci_preinit();

}

arch/arm/mach-ixp4xx/ixdp425-pci.c

+0 −5
Original line number Diff line number Diff line
@@ -32,11 +32,6 @@ void __init ixdp425_pci_preinit(void) 
	set_irq_type(IRQ_IXDP425_PCI_INTC, IRQT_LOW);

	set_irq_type(IRQ_IXDP425_PCI_INTD, IRQT_LOW);



	gpio_line_isr_clear(IXDP425_PCI_INTA_PIN);

	gpio_line_isr_clear(IXDP425_PCI_INTB_PIN);

	gpio_line_isr_clear(IXDP425_PCI_INTC_PIN);

	gpio_line_isr_clear(IXDP425_PCI_INTD_PIN);



	ixp4xx_pci_preinit();

}

arch/arm/mach-ixp4xx/ixdpg425-pci.c

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ void __init ixdpg425_pci_preinit(void) 
	set_irq_type(IRQ_IXP4XX_GPIO6, IRQT_LOW);

	set_irq_type(IRQ_IXP4XX_GPIO7, IRQT_LOW);



	gpio_line_isr_clear(6);

	gpio_line_isr_clear(7);



	ixp4xx_pci_preinit();

}

arch/arm/mach-ixp4xx/nslu2-pci.c

+0 −8
Original line number Diff line number Diff line
@@ -28,14 +28,6 @@ void __init nslu2_pci_preinit(void) 
	set_irq_type(IRQ_NSLU2_PCI_INTB, IRQT_LOW);

	set_irq_type(IRQ_NSLU2_PCI_INTC, IRQT_LOW);



	gpio_line_isr_clear(NSLU2_PCI_INTA_PIN);

	gpio_line_isr_clear(NSLU2_PCI_INTB_PIN);

	gpio_line_isr_clear(NSLU2_PCI_INTC_PIN);



	/* INTD is not configured as GPIO is used

	 * for the power input button.

	 */



	ixp4xx_pci_preinit();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE