浏览代码

[PATCH] cs89x0: use #elif instead of #else/#if/#endif

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Lennert Buytenhek 19 年之前
父节点
当前提交
580d7b8cc5
共有 1 个文件被更改,包括 1 次插入3 次删除
  1. 1 3
      drivers/net/cs89x0.c

+ 1 - 3
drivers/net/cs89x0.c

@@ -353,8 +353,7 @@ writeword(unsigned long base_addr, int portno, int value)
 {
 {
 	__raw_writel((u16)value, base_addr + (portno << 1));
 	__raw_writel((u16)value, base_addr + (portno << 1));
 }
 }
-#else
-#if defined(CONFIG_ARCH_PNX010X)
+#elif defined(CONFIG_ARCH_PNX010X)
 static int
 static int
 readword(unsigned long base_addr, int portno)
 readword(unsigned long base_addr, int portno)
 {
 {
@@ -379,7 +378,6 @@ writeword(unsigned long base_addr, int portno, int value)
 	outw(value, base_addr + portno);
 	outw(value, base_addr + portno);
 }
 }
 #endif
 #endif
-#endif
 
 
 static void
 static void
 readwords(unsigned long base_addr, int portno, void *buf, int length)
 readwords(unsigned long base_addr, int portno, void *buf, int length)