aboutsummaryrefslogtreecommitdiff
path: root/sound/oss/vwsnd.c
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-03-26 01:37:37 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 08:56:58 -0800
commit8f3b50fc72d538c79dd2c1f728f5e594a0192da2 (patch)
tree467c8e0880c7470d4d169a6d149c5946876c20ea /sound/oss/vwsnd.c
parent1751ace034bba6b423c1de4668f0e65cc9ef2b84 (diff)
downloadlinux-2.6.34-ux500-8f3b50fc72d538c79dd2c1f728f5e594a0192da2.tar.gz
[PATCH] Fix compilation for sound/oss/vwsnd.c
Fix compilation for sound/oss/vwsnd.o, by moving li_destroy() above li_create() sound/oss/vwsnd.c:275: warning: conflicting types for ‘li_destroy’ sound/oss/vwsnd.c:275: error: static declaration of ‘li_destroy’ follows non-static declaration sound/oss/vwsnd.c:264: error: previous implicit declaration of ‘li_destroy’ was here Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss/vwsnd.c')
-rw-r--r--sound/oss/vwsnd.c40
1 files changed, 19 insertions, 21 deletions
diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c
index b372e88e857..5f140c7586b 100644
--- a/sound/oss/vwsnd.c
+++ b/sound/oss/vwsnd.c
@@ -248,27 +248,6 @@ typedef struct lithium {
} lithium_t;
/*
- * li_create initializes the lithium_t structure and sets up vm mappings
- * to access the registers.
- * Returns 0 on success, -errno on failure.
- */
-
-static int __init li_create(lithium_t *lith, unsigned long baseaddr)
-{
- static void li_destroy(lithium_t *);
-
- spin_lock_init(&lith->lock);
- lith->page0 = ioremap_nocache(baseaddr + LI_PAGE0_OFFSET, PAGE_SIZE);
- lith->page1 = ioremap_nocache(baseaddr + LI_PAGE1_OFFSET, PAGE_SIZE);
- lith->page2 = ioremap_nocache(baseaddr + LI_PAGE2_OFFSET, PAGE_SIZE);
- if (!lith->page0 || !lith->page1 || !lith->page2) {
- li_destroy(lith);
- return -ENOMEM;
- }
- return 0;
-}
-
-/*
* li_destroy destroys the lithium_t structure and vm mappings.
*/
@@ -289,6 +268,25 @@ static void li_destroy(lithium_t *lith)
}
/*
+ * li_create initializes the lithium_t structure and sets up vm mappings
+ * to access the registers.
+ * Returns 0 on success, -errno on failure.
+ */
+
+static int __init li_create(lithium_t *lith, unsigned long baseaddr)
+{
+ spin_lock_init(&lith->lock);
+ lith->page0 = ioremap_nocache(baseaddr + LI_PAGE0_OFFSET, PAGE_SIZE);
+ lith->page1 = ioremap_nocache(baseaddr + LI_PAGE1_OFFSET, PAGE_SIZE);
+ lith->page2 = ioremap_nocache(baseaddr + LI_PAGE2_OFFSET, PAGE_SIZE);
+ if (!lith->page0 || !lith->page1 || !lith->page2) {
+ li_destroy(lith);
+ return -ENOMEM;
+ }
+ return 0;
+}
+
+/*
* basic register accessors - read/write long/byte
*/