[ARM] 5179/1: Replace obsolete IRQT_* and __IRQT_* values with IRQ_TYPE_*
IRQT_* and __IRQT_* were obsoleted long ago by patch [3692/1]. Remove them completely. Sed script for the reference: s/__IRQT_RISEDGE/IRQ_TYPE_EDGE_RISING/g s/__IRQT_FALEDGE/IRQ_TYPE_EDGE_FALLING/g s/__IRQT_LOWLVL/IRQ_TYPE_LEVEL_LOW/g s/__IRQT_HIGHLVL/IRQ_TYPE_LEVEL_HIGH/g s/IRQT_RISING/IRQ_TYPE_EDGE_RISING/g s/IRQT_FALLING/IRQ_TYPE_EDGE_FALLING/g s/IRQT_BOTHEDGE/IRQ_TYPE_EDGE_BOTH/g s/IRQT_LOW/IRQ_TYPE_LEVEL_LOW/g s/IRQT_HIGH/IRQ_TYPE_LEVEL_HIGH/g s/IRQT_PROBE/IRQ_TYPE_PROBE/g s/IRQT_NOEDGE/IRQ_TYPE_NONE/g Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
committed by
Russell King
parent
d9ecdb282c
commit
6cab486029
@@ -256,28 +256,28 @@ static int asic3_gpio_irq_type(unsigned int irq, unsigned int type)
|
||||
bank + ASIC3_GPIO_TRIGGER_TYPE);
|
||||
asic->irq_bothedge[(irq - asic->irq_base) >> 4] &= ~bit;
|
||||
|
||||
if (type == IRQT_RISING) {
|
||||
if (type == IRQ_TYPE_EDGE_RISING) {
|
||||
trigger |= bit;
|
||||
edge |= bit;
|
||||
} else if (type == IRQT_FALLING) {
|
||||
} else if (type == IRQ_TYPE_EDGE_FALLING) {
|
||||
trigger |= bit;
|
||||
edge &= ~bit;
|
||||
} else if (type == IRQT_BOTHEDGE) {
|
||||
} else if (type == IRQ_TYPE_EDGE_BOTH) {
|
||||
trigger |= bit;
|
||||
if (asic3_gpio_get(&asic->gpio, irq - asic->irq_base))
|
||||
edge &= ~bit;
|
||||
else
|
||||
edge |= bit;
|
||||
asic->irq_bothedge[(irq - asic->irq_base) >> 4] |= bit;
|
||||
} else if (type == IRQT_LOW) {
|
||||
} else if (type == IRQ_TYPE_LEVEL_LOW) {
|
||||
trigger &= ~bit;
|
||||
level &= ~bit;
|
||||
} else if (type == IRQT_HIGH) {
|
||||
} else if (type == IRQ_TYPE_LEVEL_HIGH) {
|
||||
trigger &= ~bit;
|
||||
level |= bit;
|
||||
} else {
|
||||
/*
|
||||
* if type == IRQT_NOEDGE, we should mask interrupts, but
|
||||
* if type == IRQ_TYPE_NONE, we should mask interrupts, but
|
||||
* be careful to not unmask them if mask was also called.
|
||||
* Probably need internal state for mask.
|
||||
*/
|
||||
@@ -343,7 +343,7 @@ static int __init asic3_irq_probe(struct platform_device *pdev)
|
||||
ASIC3_INTMASK_GINTMASK);
|
||||
|
||||
set_irq_chained_handler(asic->irq_nr, asic3_irq_demux);
|
||||
set_irq_type(asic->irq_nr, IRQT_RISING);
|
||||
set_irq_type(asic->irq_nr, IRQ_TYPE_EDGE_RISING);
|
||||
set_irq_data(asic->irq_nr, asic);
|
||||
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user