diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2007-07-24 03:16:59 -0400 |
---|---|---|
committer | Bryan Wu <bryan.wu@analog.com> | 2007-07-24 03:16:59 -0400 |
commit | 6782ea9ae8c2aa82dfeab84cb168126fbcbf4526 (patch) | |
tree | 4e6acf3678d3d5e41b3136a0e44c9bcc6e0d5eb0 | |
parent | 40d63406a0dfc070fff9336c182619a0b167f165 (diff) |
Blackfin arch: Add label to call new GPIO API
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
-rw-r--r-- | arch/blackfin/mach-common/ints-priority-dc.c | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-common/ints-priority-sc.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/blackfin/mach-common/ints-priority-dc.c b/arch/blackfin/mach-common/ints-priority-dc.c index 660f881b620a..d5d9e57813dd 100644 --- a/arch/blackfin/mach-common/ints-priority-dc.c +++ b/arch/blackfin/mach-common/ints-priority-dc.c | |||
@@ -221,7 +221,7 @@ static unsigned int bf561_gpio_irq_startup(unsigned int irq) | |||
221 | 221 | ||
222 | if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) { | 222 | if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) { |
223 | 223 | ||
224 | ret = gpio_request(gpionr, NULL); | 224 | ret = gpio_request(gpionr, "IRQ"); |
225 | if (ret) | 225 | if (ret) |
226 | return ret; | 226 | return ret; |
227 | 227 | ||
@@ -261,7 +261,7 @@ static int bf561_gpio_irq_type(unsigned int irq, unsigned int type) | |||
261 | 261 | ||
262 | if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) { | 262 | if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) { |
263 | 263 | ||
264 | ret = gpio_request(gpionr, NULL); | 264 | ret = gpio_request(gpionr, "IRQ"); |
265 | if (ret) | 265 | if (ret) |
266 | return ret; | 266 | return ret; |
267 | 267 | ||
diff --git a/arch/blackfin/mach-common/ints-priority-sc.c b/arch/blackfin/mach-common/ints-priority-sc.c index 4708023fe716..505b9484497a 100644 --- a/arch/blackfin/mach-common/ints-priority-sc.c +++ b/arch/blackfin/mach-common/ints-priority-sc.c | |||
@@ -343,7 +343,7 @@ static unsigned int bfin_gpio_irq_startup(unsigned int irq) | |||
343 | u16 gpionr = irq - IRQ_PF0; | 343 | u16 gpionr = irq - IRQ_PF0; |
344 | 344 | ||
345 | if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) { | 345 | if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) { |
346 | ret = gpio_request(gpionr, NULL); | 346 | ret = gpio_request(gpionr, "IRQ"); |
347 | if (ret) | 347 | if (ret) |
348 | return ret; | 348 | return ret; |
349 | } | 349 | } |
@@ -377,7 +377,7 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type) | |||
377 | if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING | | 377 | if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING | |
378 | IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) { | 378 | IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) { |
379 | if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) { | 379 | if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) { |
380 | ret = gpio_request(gpionr, NULL); | 380 | ret = gpio_request(gpionr, "IRQ"); |
381 | if (ret) | 381 | if (ret) |
382 | return ret; | 382 | return ret; |
383 | } | 383 | } |
@@ -587,7 +587,7 @@ static unsigned int bfin_gpio_irq_startup(unsigned int irq) | |||
587 | } | 587 | } |
588 | 588 | ||
589 | if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) { | 589 | if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) { |
590 | ret = gpio_request(gpionr, NULL); | 590 | ret = gpio_request(gpionr, "IRQ"); |
591 | if (ret) | 591 | if (ret) |
592 | return ret; | 592 | return ret; |
593 | } | 593 | } |
@@ -627,7 +627,7 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type) | |||
627 | if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING | | 627 | if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING | |
628 | IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) { | 628 | IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) { |
629 | if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) { | 629 | if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) { |
630 | ret = gpio_request(gpionr, NULL); | 630 | ret = gpio_request(gpionr, "IRQ"); |
631 | if (ret) | 631 | if (ret) |
632 | return ret; | 632 | return ret; |
633 | } | 633 | } |