diff options
author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2008-07-26 23:23:31 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-27 04:46:18 -0400 |
commit | 6cab48602996cdbcb277375a8107d53e21e8c9b9 (patch) | |
tree | 5a1c8aaf3eed2d5a53170ab69daa94088947d43d /arch/arm/mach-ixp23xx | |
parent | d9ecdb282c91952796b7542c4f57fd6de6948d7b (diff) |
[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>
Diffstat (limited to 'arch/arm/mach-ixp23xx')
-rw-r--r-- | arch/arm/mach-ixp23xx/core.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/roadrunner.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c index 5fea5a132939..df16a4eac490 100644 --- a/arch/arm/mach-ixp23xx/core.c +++ b/arch/arm/mach-ixp23xx/core.c | |||
@@ -126,23 +126,23 @@ static int ixp23xx_irq_set_type(unsigned int irq, unsigned int type) | |||
126 | return -EINVAL; | 126 | return -EINVAL; |
127 | 127 | ||
128 | switch (type) { | 128 | switch (type) { |
129 | case IRQT_BOTHEDGE: | 129 | case IRQ_TYPE_EDGE_BOTH: |
130 | int_style = IXP23XX_GPIO_STYLE_TRANSITIONAL; | 130 | int_style = IXP23XX_GPIO_STYLE_TRANSITIONAL; |
131 | irq_type = IXP23XX_IRQ_EDGE; | 131 | irq_type = IXP23XX_IRQ_EDGE; |
132 | break; | 132 | break; |
133 | case IRQT_RISING: | 133 | case IRQ_TYPE_EDGE_RISING: |
134 | int_style = IXP23XX_GPIO_STYLE_RISING_EDGE; | 134 | int_style = IXP23XX_GPIO_STYLE_RISING_EDGE; |
135 | irq_type = IXP23XX_IRQ_EDGE; | 135 | irq_type = IXP23XX_IRQ_EDGE; |
136 | break; | 136 | break; |
137 | case IRQT_FALLING: | 137 | case IRQ_TYPE_EDGE_FALLING: |
138 | int_style = IXP23XX_GPIO_STYLE_FALLING_EDGE; | 138 | int_style = IXP23XX_GPIO_STYLE_FALLING_EDGE; |
139 | irq_type = IXP23XX_IRQ_EDGE; | 139 | irq_type = IXP23XX_IRQ_EDGE; |
140 | break; | 140 | break; |
141 | case IRQT_HIGH: | 141 | case IRQ_TYPE_LEVEL_HIGH: |
142 | int_style = IXP23XX_GPIO_STYLE_ACTIVE_HIGH; | 142 | int_style = IXP23XX_GPIO_STYLE_ACTIVE_HIGH; |
143 | irq_type = IXP23XX_IRQ_LEVEL; | 143 | irq_type = IXP23XX_IRQ_LEVEL; |
144 | break; | 144 | break; |
145 | case IRQT_LOW: | 145 | case IRQ_TYPE_LEVEL_LOW: |
146 | int_style = IXP23XX_GPIO_STYLE_ACTIVE_LOW; | 146 | int_style = IXP23XX_GPIO_STYLE_ACTIVE_LOW; |
147 | irq_type = IXP23XX_IRQ_LEVEL; | 147 | irq_type = IXP23XX_IRQ_LEVEL; |
148 | break; | 148 | break; |
diff --git a/arch/arm/mach-ixp23xx/roadrunner.c b/arch/arm/mach-ixp23xx/roadrunner.c index f0f70ba1e46d..896ff9f840d9 100644 --- a/arch/arm/mach-ixp23xx/roadrunner.c +++ b/arch/arm/mach-ixp23xx/roadrunner.c | |||
@@ -110,8 +110,8 @@ static int __init roadrunner_map_irq(struct pci_dev *dev, u8 idsel, u8 pin) | |||
110 | 110 | ||
111 | static void __init roadrunner_pci_preinit(void) | 111 | static void __init roadrunner_pci_preinit(void) |
112 | { | 112 | { |
113 | set_irq_type(IRQ_ROADRUNNER_PCI_INTC, IRQT_LOW); | 113 | set_irq_type(IRQ_ROADRUNNER_PCI_INTC, IRQ_TYPE_LEVEL_LOW); |
114 | set_irq_type(IRQ_ROADRUNNER_PCI_INTD, IRQT_LOW); | 114 | set_irq_type(IRQ_ROADRUNNER_PCI_INTD, IRQ_TYPE_LEVEL_LOW); |
115 | 115 | ||
116 | ixp23xx_pci_preinit(); | 116 | ixp23xx_pci_preinit(); |
117 | } | 117 | } |