浏览代码

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>
Jesper Nilsson 10 年之前
父节点
当前提交
9423017867
共有 1 个文件被更改,包括 6 次插入2 次删除
  1. 6 2
      arch/cris/arch-v32/mach-fs/pinmux.c

+ 6 - 2
arch/cris/arch-v32/mach-fs/pinmux.c

@@ -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: