mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
CRISv32: ETRAX FS: Squash warnings in pinmux driver
Squash the followng warnings arch/cris/arch-v32/mach-fs/pinmux.c: In function 'crisv32_pinmux_alloc_fixed': arch/cris/arch-v32/mach-fs/pinmux.c:104:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] arch/cris/arch-v32/mach-fs/pinmux.c: In function 'crisv32_pinmux_dealloc_fixed': arch/cris/arch-v32/mach-fs/pinmux.c:238:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] arch/cris/arch-v32/mach-fs/pinmux.c: In function '__crisv32_pinmux_alloc': arch/cris/arch-v32/mach-fs/pinmux.c:49:1: warning: control reaches end of non-void function [-Wreturn-type] Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
This commit is contained in:
parent
ee59843cd2
commit
9423017867
1 changed files with 6 additions and 2 deletions
|
@ -46,6 +46,8 @@ static int __crisv32_pinmux_alloc(int port, int first_pin, int last_pin,
|
||||||
pins[port][i] = mode;
|
pins[port][i] = mode;
|
||||||
|
|
||||||
crisv32_pinmux_set(port);
|
crisv32_pinmux_set(port);
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int crisv32_pinmux_init(void)
|
static int crisv32_pinmux_init(void)
|
||||||
|
@ -93,6 +95,7 @@ int crisv32_pinmux_alloc_fixed(enum fixed_function function)
|
||||||
int ret = -EINVAL;
|
int ret = -EINVAL;
|
||||||
char saved[sizeof pins];
|
char saved[sizeof pins];
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
reg_pinmux_rw_hwprot hwprot;
|
||||||
|
|
||||||
spin_lock_irqsave(&pinmux_lock, flags);
|
spin_lock_irqsave(&pinmux_lock, flags);
|
||||||
|
|
||||||
|
@ -101,7 +104,7 @@ int crisv32_pinmux_alloc_fixed(enum fixed_function function)
|
||||||
|
|
||||||
crisv32_pinmux_init(); /* Must be done before we read rw_hwprot */
|
crisv32_pinmux_init(); /* Must be done before we read rw_hwprot */
|
||||||
|
|
||||||
reg_pinmux_rw_hwprot hwprot = REG_RD(pinmux, regi_pinmux, rw_hwprot);
|
hwprot = REG_RD(pinmux, regi_pinmux, rw_hwprot);
|
||||||
|
|
||||||
switch (function) {
|
switch (function) {
|
||||||
case pinmux_ser1:
|
case pinmux_ser1:
|
||||||
|
@ -227,6 +230,7 @@ int crisv32_pinmux_dealloc_fixed(enum fixed_function function)
|
||||||
int ret = -EINVAL;
|
int ret = -EINVAL;
|
||||||
char saved[sizeof pins];
|
char saved[sizeof pins];
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
reg_pinmux_rw_hwprot hwprot;
|
||||||
|
|
||||||
spin_lock_irqsave(&pinmux_lock, flags);
|
spin_lock_irqsave(&pinmux_lock, flags);
|
||||||
|
|
||||||
|
@ -235,7 +239,7 @@ int crisv32_pinmux_dealloc_fixed(enum fixed_function function)
|
||||||
|
|
||||||
crisv32_pinmux_init(); /* Must be done before we read rw_hwprot */
|
crisv32_pinmux_init(); /* Must be done before we read rw_hwprot */
|
||||||
|
|
||||||
reg_pinmux_rw_hwprot hwprot = REG_RD(pinmux, regi_pinmux, rw_hwprot);
|
hwprot = REG_RD(pinmux, regi_pinmux, rw_hwprot);
|
||||||
|
|
||||||
switch (function) {
|
switch (function) {
|
||||||
case pinmux_ser1:
|
case pinmux_ser1:
|
||||||
|
|
Loading…
Reference in a new issue