diff options
Diffstat (limited to 'arch/blackfin/kernel/bfin_gpio.c')
-rw-r--r-- | arch/blackfin/kernel/bfin_gpio.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c index bb1f4fb2467c..bafcfa52142b 100644 --- a/arch/blackfin/kernel/bfin_gpio.c +++ b/arch/blackfin/kernel/bfin_gpio.c | |||
@@ -162,7 +162,7 @@ static void port_setup(unsigned short gpio, unsigned short usage) | |||
162 | 162 | ||
163 | static void default_gpio(unsigned short gpio) | 163 | static void default_gpio(unsigned short gpio) |
164 | { | 164 | { |
165 | unsigned short bank,bitmask; | 165 | unsigned short bank, bitmask; |
166 | 166 | ||
167 | bank = gpio_bank(gpio); | 167 | bank = gpio_bank(gpio); |
168 | bitmask = gpio_bit(gpio); | 168 | bitmask = gpio_bit(gpio); |
@@ -183,7 +183,7 @@ static int __init bfin_gpio_init(void) | |||
183 | 183 | ||
184 | printk(KERN_INFO "Blackfin GPIO Controller\n"); | 184 | printk(KERN_INFO "Blackfin GPIO Controller\n"); |
185 | 185 | ||
186 | for (i = 0; i < MAX_BLACKFIN_GPIOS; i+=GPIO_BANKSIZE) | 186 | for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) |
187 | reserved_map[gpio_bank(i)] = 0; | 187 | reserved_map[gpio_bank(i)] = 0; |
188 | 188 | ||
189 | #if defined(BF537_FAMILY) && (defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)) | 189 | #if defined(BF537_FAMILY) && (defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)) |
@@ -478,7 +478,7 @@ u32 gpio_pm_setup(void) | |||
478 | u32 sic_iwr = 0; | 478 | u32 sic_iwr = 0; |
479 | u16 bank, mask, i, gpio; | 479 | u16 bank, mask, i, gpio; |
480 | 480 | ||
481 | for (i = 0; i < MAX_BLACKFIN_GPIOS; i+=GPIO_BANKSIZE) { | 481 | for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) { |
482 | mask = wakeup_map[gpio_bank(i)]; | 482 | mask = wakeup_map[gpio_bank(i)]; |
483 | bank = gpio_bank(i); | 483 | bank = gpio_bank(i); |
484 | 484 | ||
@@ -522,12 +522,11 @@ u32 gpio_pm_setup(void) | |||
522 | return IWR_ENABLE_ALL; | 522 | return IWR_ENABLE_ALL; |
523 | } | 523 | } |
524 | 524 | ||
525 | |||
526 | void gpio_pm_restore(void) | 525 | void gpio_pm_restore(void) |
527 | { | 526 | { |
528 | u16 bank, mask, i; | 527 | u16 bank, mask, i; |
529 | 528 | ||
530 | for (i = 0; i < MAX_BLACKFIN_GPIOS; i+=GPIO_BANKSIZE) { | 529 | for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) { |
531 | mask = wakeup_map[gpio_bank(i)]; | 530 | mask = wakeup_map[gpio_bank(i)]; |
532 | bank = gpio_bank(i); | 531 | bank = gpio_bank(i); |
533 | 532 | ||
@@ -591,7 +590,6 @@ int gpio_request(unsigned short gpio, const char *label) | |||
591 | } | 590 | } |
592 | EXPORT_SYMBOL(gpio_request); | 591 | EXPORT_SYMBOL(gpio_request); |
593 | 592 | ||
594 | |||
595 | void gpio_free(unsigned short gpio) | 593 | void gpio_free(unsigned short gpio) |
596 | { | 594 | { |
597 | unsigned long flags; | 595 | unsigned long flags; |
@@ -616,7 +614,6 @@ void gpio_free(unsigned short gpio) | |||
616 | } | 614 | } |
617 | EXPORT_SYMBOL(gpio_free); | 615 | EXPORT_SYMBOL(gpio_free); |
618 | 616 | ||
619 | |||
620 | void gpio_direction_input(unsigned short gpio) | 617 | void gpio_direction_input(unsigned short gpio) |
621 | { | 618 | { |
622 | unsigned long flags; | 619 | unsigned long flags; |