Commit 8f3b50fc72d538c79dd2c1f728f5e594a0192da2
Committed by
Linus Torvalds
Linus Torvalds
1 parent
1751ace034
Exists in
master
and in
7 other branches
[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>
Showing 1 changed file with 19 additions and 21 deletions Side-by-side Diff
sound/oss/vwsnd.c
| ... | ... | @@ -248,27 +248,6 @@ |
| 248 | 248 | } lithium_t; |
| 249 | 249 | |
| 250 | 250 | /* |
| 251 | - * li_create initializes the lithium_t structure and sets up vm mappings | |
| 252 | - * to access the registers. | |
| 253 | - * Returns 0 on success, -errno on failure. | |
| 254 | - */ | |
| 255 | - | |
| 256 | -static int __init li_create(lithium_t *lith, unsigned long baseaddr) | |
| 257 | -{ | |
| 258 | - static void li_destroy(lithium_t *); | |
| 259 | - | |
| 260 | - spin_lock_init(&lith->lock); | |
| 261 | - lith->page0 = ioremap_nocache(baseaddr + LI_PAGE0_OFFSET, PAGE_SIZE); | |
| 262 | - lith->page1 = ioremap_nocache(baseaddr + LI_PAGE1_OFFSET, PAGE_SIZE); | |
| 263 | - lith->page2 = ioremap_nocache(baseaddr + LI_PAGE2_OFFSET, PAGE_SIZE); | |
| 264 | - if (!lith->page0 || !lith->page1 || !lith->page2) { | |
| 265 | - li_destroy(lith); | |
| 266 | - return -ENOMEM; | |
| 267 | - } | |
| 268 | - return 0; | |
| 269 | -} | |
| 270 | - | |
| 271 | -/* | |
| 272 | 251 | * li_destroy destroys the lithium_t structure and vm mappings. |
| 273 | 252 | */ |
| 274 | 253 | |
| ... | ... | @@ -286,6 +265,25 @@ |
| 286 | 265 | iounmap(lith->page2); |
| 287 | 266 | lith->page2 = NULL; |
| 288 | 267 | } |
| 268 | +} | |
| 269 | + | |
| 270 | +/* | |
| 271 | + * li_create initializes the lithium_t structure and sets up vm mappings | |
| 272 | + * to access the registers. | |
| 273 | + * Returns 0 on success, -errno on failure. | |
| 274 | + */ | |
| 275 | + | |
| 276 | +static int __init li_create(lithium_t *lith, unsigned long baseaddr) | |
| 277 | +{ | |
| 278 | + spin_lock_init(&lith->lock); | |
| 279 | + lith->page0 = ioremap_nocache(baseaddr + LI_PAGE0_OFFSET, PAGE_SIZE); | |
| 280 | + lith->page1 = ioremap_nocache(baseaddr + LI_PAGE1_OFFSET, PAGE_SIZE); | |
| 281 | + lith->page2 = ioremap_nocache(baseaddr + LI_PAGE2_OFFSET, PAGE_SIZE); | |
| 282 | + if (!lith->page0 || !lith->page1 || !lith->page2) { | |
| 283 | + li_destroy(lith); | |
| 284 | + return -ENOMEM; | |
| 285 | + } | |
| 286 | + return 0; | |
| 289 | 287 | } |
| 290 | 288 | |
| 291 | 289 | /* |