lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Blackfin] arch: fix up gpio code style -- no functional changes

Browse Source 
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
This commit is contained in:
Mike Frysinger
2008-03-26 08:35:46 +08:00
committed by Bryan Wu
parent f85c4abdbc
commit d171c23327
1 changed files with 39 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
arch/blackfin/kernel/bfin_gpio.c
View File

@@ -348,11 +348,10 @@ static void portmux_setup(unsigned short per, unsigned short function)
offset = port_mux_lut[y].offset; offset = port_mux_lut[y].offset;
muxreg = bfin_read_PORT_MUX(); muxreg = bfin_read_PORT_MUX();
if (offset != 1) { if (offset != 1)
muxreg &= ~(1 << offset); muxreg &= ~(1 << offset);
} else { else
muxreg &= ~(3 << 1); muxreg &= ~(3 << 1);
}
muxreg |= (function << offset); muxreg |= (function << offset);
bfin_write_PORT_MUX(muxreg); bfin_write_PORT_MUX(muxreg);
@@ -424,11 +423,9 @@ static void default_gpio(unsigned gpio)
static int __init bfin_gpio_init(void) static int __init bfin_gpio_init(void)
{ {
printk(KERN_INFO "Blackfin GPIO Controller\n"); printk(KERN_INFO "Blackfin GPIO Controller\n");
return 0; return 0;
} }
arch_initcall(bfin_gpio_init); arch_initcall(bfin_gpio_init);
@@ -954,9 +951,9 @@ int peripheral_request_list(unsigned short per[], const char *label)
ret = peripheral_request(per[cnt], label); ret = peripheral_request(per[cnt], label);
if (ret < 0) { if (ret < 0) {
for ( ; cnt > 0; cnt--) { for ( ; cnt > 0; cnt--)
peripheral_free(per[cnt - 1]); peripheral_free(per[cnt - 1]);
}
return ret; return ret;
} }
} }
@@ -981,15 +978,13 @@ void peripheral_free(unsigned short per)
local_irq_save(flags); local_irq_save(flags);
if (unlikely(!(reserved_peri_map[gpio_bank(ident)] if (unlikely(!(reserved_peri_map[gpio_bank(ident)] & gpio_bit(ident)))) {
& gpio_bit(ident)))) {
local_irq_restore(flags); local_irq_restore(flags);
return; return;
} }
if (!(per & P_MAYSHARE)) { if (!(per & P_MAYSHARE))
port_setup(ident, GPIO_USAGE); port_setup(ident, GPIO_USAGE);
}
reserved_peri_map[gpio_bank(ident)] &= ~gpio_bit(ident); reserved_peri_map[gpio_bank(ident)] &= ~gpio_bit(ident);
@@ -1002,12 +997,9 @@ EXPORT_SYMBOL(peripheral_free);
void peripheral_free_list(unsigned short per[]) void peripheral_free_list(unsigned short per[])
{ {
u16 cnt; u16 cnt;
for (cnt = 0; per[cnt] != 0; cnt++)
for (cnt = 0; per[cnt] != 0; cnt++) {
peripheral_free(per[cnt]); peripheral_free(per[cnt]);
} }
}
EXPORT_SYMBOL(peripheral_free_list); EXPORT_SYMBOL(peripheral_free_list);
/*********************************************************** /***********************************************************