diff options
Diffstat (limited to 'arch/arm/mach-lh7a40x')
-rw-r--r-- | arch/arm/mach-lh7a40x/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/arch-kev7a400.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/arch-lpd7a40x.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/irq-kev7a400.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/irq-lh7a400.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/irq-lh7a404.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-lh7a40x/irq-lpd7a40x.c | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/mach-lh7a40x/Kconfig b/arch/arm/mach-lh7a40x/Kconfig index 147b01928a9b..6f4c6a1798c1 100644 --- a/arch/arm/mach-lh7a40x/Kconfig +++ b/arch/arm/mach-lh7a40x/Kconfig | |||
@@ -8,7 +8,7 @@ config MACH_KEV7A400 | |||
8 | help | 8 | help |
9 | Say Y here if you are using the Sharp KEV7A400 development | 9 | Say Y here if you are using the Sharp KEV7A400 development |
10 | board. This hardware is discontinued, so I'd be very | 10 | board. This hardware is discontinued, so I'd be very |
11 | suprised if you wanted this option. | 11 | surprised if you wanted this option. |
12 | 12 | ||
13 | config MACH_LPD7A400 | 13 | config MACH_LPD7A400 |
14 | bool "LPD7A400 Card Engine" | 14 | bool "LPD7A400 Card Engine" |
diff --git a/arch/arm/mach-lh7a40x/arch-kev7a400.c b/arch/arm/mach-lh7a40x/arch-kev7a400.c index 15fbcc911fe7..6d26661d99f6 100644 --- a/arch/arm/mach-lh7a40x/arch-kev7a400.c +++ b/arch/arm/mach-lh7a40x/arch-kev7a400.c | |||
@@ -71,7 +71,7 @@ static struct irq_chip kev7a400_cpld_chip = { | |||
71 | }; | 71 | }; |
72 | 72 | ||
73 | 73 | ||
74 | static void kev7a400_cpld_handler (unsigned int irq, struct irqdesc *desc) | 74 | static void kev7a400_cpld_handler (unsigned int irq, struct irq_desc *desc) |
75 | { | 75 | { |
76 | u32 mask = CPLD_LATCHED_INTS; | 76 | u32 mask = CPLD_LATCHED_INTS; |
77 | irq = IRQ_KEV7A400_CPLD; | 77 | irq = IRQ_KEV7A400_CPLD; |
@@ -88,7 +88,7 @@ void __init lh7a40x_init_board_irq (void) | |||
88 | for (irq = IRQ_KEV7A400_CPLD; | 88 | for (irq = IRQ_KEV7A400_CPLD; |
89 | irq < IRQ_KEV7A400_CPLD + NR_IRQ_BOARD; ++irq) { | 89 | irq < IRQ_KEV7A400_CPLD + NR_IRQ_BOARD; ++irq) { |
90 | set_irq_chip (irq, &kev7a400_cpld_chip); | 90 | set_irq_chip (irq, &kev7a400_cpld_chip); |
91 | set_irq_handler (irq, do_edge_IRQ); | 91 | set_irq_handler (irq, handle_edge_irq); |
92 | set_irq_flags (irq, IRQF_VALID); | 92 | set_irq_flags (irq, IRQF_VALID); |
93 | } | 93 | } |
94 | set_irq_chained_handler (IRQ_CPLD, kev7a400_cpld_handler); | 94 | set_irq_chained_handler (IRQ_CPLD, kev7a400_cpld_handler); |
diff --git a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c index 8441e0a156cb..fe64946f9e18 100644 --- a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c +++ b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c | |||
@@ -207,7 +207,7 @@ static struct irq_chip lpd7a40x_cpld_chip = { | |||
207 | .unmask = lh7a40x_unmask_cpld_irq, | 207 | .unmask = lh7a40x_unmask_cpld_irq, |
208 | }; | 208 | }; |
209 | 209 | ||
210 | static void lpd7a40x_cpld_handler (unsigned int irq, struct irqdesc *desc) | 210 | static void lpd7a40x_cpld_handler (unsigned int irq, struct irq_desc *desc) |
211 | { | 211 | { |
212 | unsigned int mask = CPLD_INTERRUPTS; | 212 | unsigned int mask = CPLD_INTERRUPTS; |
213 | 213 | ||
@@ -279,7 +279,7 @@ void __init lh7a40x_init_board_irq (void) | |||
279 | for (irq = IRQ_BOARD_START; | 279 | for (irq = IRQ_BOARD_START; |
280 | irq < IRQ_BOARD_START + NR_IRQ_BOARD; ++irq) { | 280 | irq < IRQ_BOARD_START + NR_IRQ_BOARD; ++irq) { |
281 | set_irq_chip (irq, &lpd7a40x_cpld_chip); | 281 | set_irq_chip (irq, &lpd7a40x_cpld_chip); |
282 | set_irq_handler (irq, do_level_IRQ); | 282 | set_irq_handler (irq, handle_level_irq); |
283 | set_irq_flags (irq, IRQF_VALID); | 283 | set_irq_flags (irq, IRQF_VALID); |
284 | } | 284 | } |
285 | 285 | ||
diff --git a/arch/arm/mach-lh7a40x/irq-kev7a400.c b/arch/arm/mach-lh7a40x/irq-kev7a400.c index 646071334b8f..c7433b3c5812 100644 --- a/arch/arm/mach-lh7a40x/irq-kev7a400.c +++ b/arch/arm/mach-lh7a40x/irq-kev7a400.c | |||
@@ -51,7 +51,7 @@ irq_chip lh7a400_cpld_chip = { | |||
51 | }; | 51 | }; |
52 | 52 | ||
53 | static void | 53 | static void |
54 | lh7a400_cpld_handler (unsigned int irq, struct irqdesc *desc) | 54 | lh7a400_cpld_handler (unsigned int irq, struct irq_desc *desc) |
55 | { | 55 | { |
56 | u32 mask = CPLD_LATCHED_INTS; | 56 | u32 mask = CPLD_LATCHED_INTS; |
57 | irq = IRQ_KEV_7A400_CPLD; | 57 | irq = IRQ_KEV_7A400_CPLD; |
@@ -71,7 +71,7 @@ lh7a400_init_board_irq (void) | |||
71 | for (irq = IRQ_KEV7A400_CPLD; | 71 | for (irq = IRQ_KEV7A400_CPLD; |
72 | irq < IRQ_KEV7A400_CPLD + NR_IRQ_KEV7A400_CPLD; ++irq) { | 72 | irq < IRQ_KEV7A400_CPLD + NR_IRQ_KEV7A400_CPLD; ++irq) { |
73 | set_irq_chip (irq, &lh7a400_cpld_chip); | 73 | set_irq_chip (irq, &lh7a400_cpld_chip); |
74 | set_irq_handler (irq, do_edge_IRQ); | 74 | set_irq_handler (irq, handle_edge_irq); |
75 | set_irq_flags (irq, IRQF_VALID); | 75 | set_irq_flags (irq, IRQF_VALID); |
76 | } | 76 | } |
77 | set_irq_chained_handler (IRQ_CPLD, kev7a400_cpld_handler); | 77 | set_irq_chained_handler (IRQ_CPLD, kev7a400_cpld_handler); |
diff --git a/arch/arm/mach-lh7a40x/irq-lh7a400.c b/arch/arm/mach-lh7a40x/irq-lh7a400.c index 091b2dc58d25..0b938e8b4d98 100644 --- a/arch/arm/mach-lh7a40x/irq-lh7a400.c +++ b/arch/arm/mach-lh7a40x/irq-lh7a400.c | |||
@@ -74,11 +74,11 @@ void __init lh7a400_init_irq (void) | |||
74 | case IRQ_GPIO6INTR: | 74 | case IRQ_GPIO6INTR: |
75 | case IRQ_GPIO7INTR: | 75 | case IRQ_GPIO7INTR: |
76 | set_irq_chip (irq, &lh7a400_gpio_chip); | 76 | set_irq_chip (irq, &lh7a400_gpio_chip); |
77 | set_irq_handler (irq, do_level_IRQ); /* OK default */ | 77 | set_irq_handler (irq, handle_level_irq); /* OK default */ |
78 | break; | 78 | break; |
79 | default: | 79 | default: |
80 | set_irq_chip (irq, &lh7a400_internal_chip); | 80 | set_irq_chip (irq, &lh7a400_internal_chip); |
81 | set_irq_handler (irq, do_level_IRQ); | 81 | set_irq_handler (irq, handle_level_irq); |
82 | } | 82 | } |
83 | set_irq_flags (irq, IRQF_VALID); | 83 | set_irq_flags (irq, IRQF_VALID); |
84 | } | 84 | } |
diff --git a/arch/arm/mach-lh7a40x/irq-lh7a404.c b/arch/arm/mach-lh7a40x/irq-lh7a404.c index 7059b983724f..5760f8c53e89 100644 --- a/arch/arm/mach-lh7a40x/irq-lh7a404.c +++ b/arch/arm/mach-lh7a40x/irq-lh7a404.c | |||
@@ -161,13 +161,13 @@ void __init lh7a404_init_irq (void) | |||
161 | set_irq_chip (irq, irq < 32 | 161 | set_irq_chip (irq, irq < 32 |
162 | ? &lh7a404_gpio_vic1_chip | 162 | ? &lh7a404_gpio_vic1_chip |
163 | : &lh7a404_gpio_vic2_chip); | 163 | : &lh7a404_gpio_vic2_chip); |
164 | set_irq_handler (irq, do_level_IRQ); /* OK default */ | 164 | set_irq_handler (irq, handle_level_irq); /* OK default */ |
165 | break; | 165 | break; |
166 | default: | 166 | default: |
167 | set_irq_chip (irq, irq < 32 | 167 | set_irq_chip (irq, irq < 32 |
168 | ? &lh7a404_vic1_chip | 168 | ? &lh7a404_vic1_chip |
169 | : &lh7a404_vic2_chip); | 169 | : &lh7a404_vic2_chip); |
170 | set_irq_handler (irq, do_level_IRQ); | 170 | set_irq_handler (irq, handle_level_irq); |
171 | } | 171 | } |
172 | set_irq_flags (irq, IRQF_VALID); | 172 | set_irq_flags (irq, IRQF_VALID); |
173 | } | 173 | } |
diff --git a/arch/arm/mach-lh7a40x/irq-lpd7a40x.c b/arch/arm/mach-lh7a40x/irq-lpd7a40x.c index b20376804bbb..15b9577023c9 100644 --- a/arch/arm/mach-lh7a40x/irq-lpd7a40x.c +++ b/arch/arm/mach-lh7a40x/irq-lpd7a40x.c | |||
@@ -57,7 +57,7 @@ static struct irq_chip lh7a40x_cpld_chip = { | |||
57 | .unmask = lh7a40x_unmask_cpld_irq, | 57 | .unmask = lh7a40x_unmask_cpld_irq, |
58 | }; | 58 | }; |
59 | 59 | ||
60 | static void lh7a40x_cpld_handler (unsigned int irq, struct irqdesc *desc) | 60 | static void lh7a40x_cpld_handler (unsigned int irq, struct irq_desc *desc) |
61 | { | 61 | { |
62 | unsigned int mask = CPLD_INTERRUPTS; | 62 | unsigned int mask = CPLD_INTERRUPTS; |
63 | 63 | ||
@@ -118,7 +118,7 @@ void __init lh7a40x_init_board_irq (void) | |||
118 | for (irq = IRQ_BOARD_START; | 118 | for (irq = IRQ_BOARD_START; |
119 | irq < IRQ_BOARD_START + NR_IRQ_BOARD; ++irq) { | 119 | irq < IRQ_BOARD_START + NR_IRQ_BOARD; ++irq) { |
120 | set_irq_chip (irq, &lh7a40x_cpld_chip); | 120 | set_irq_chip (irq, &lh7a40x_cpld_chip); |
121 | set_irq_handler (irq, do_edge_IRQ); | 121 | set_irq_handler (irq, handle_edge_irq); |
122 | set_irq_flags (irq, IRQF_VALID); | 122 | set_irq_flags (irq, IRQF_VALID); |
123 | } | 123 | } |
124 | 124 | ||