tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] m68k: dmasound_paula.c lvalues abuse (from m68k CVS)

Avoid warnings about use of cast expressions as lvalues

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Al Viro and committed by Linus Torvalds 815f597b 09cc07a5

+4 -3
unified split
+4 -3
sound/oss/dmasound/dmasound_paula.c
··· 245 u_char frame[], ssize_t *frameUsed, \ 246 ssize_t frameLeft) \ 247 { \ 248 ssize_t count, used; \ 249 u_short data; \ 250 \ ··· 255 count = min_t(size_t, userCount, frameLeft)>>1 & ~1; \ 256 used = count*2; \ 257 while (count > 0) { \ 258 - if (get_user(data, ((u_short *)userPtr)++)) \ 259 return -EFAULT; \ 260 data = convsample(data); \ 261 *high++ = data>>8; \ ··· 270 count = min_t(size_t, userCount, frameLeft)>>2 & ~1; \ 271 used = count*4; \ 272 while (count > 0) { \ 273 - if (get_user(data, ((u_short *)userPtr)++)) \ 274 return -EFAULT; \ 275 data = convsample(data); \ 276 *lefth++ = data>>8; \ 277 *leftl++ = (data>>2) & 0x3f; \ 278 - if (get_user(data, ((u_short *)userPtr)++)) \ 279 return -EFAULT; \ 280 data = convsample(data); \ 281 *righth++ = data>>8; \
··· 245 u_char frame[], ssize_t *frameUsed, \ 246 ssize_t frameLeft) \ 247 { \ 248 + const u_short *ptr = (const u_short *)userPtr; \ 249 ssize_t count, used; \ 250 u_short data; \ 251 \ ··· 254 count = min_t(size_t, userCount, frameLeft)>>1 & ~1; \ 255 used = count*2; \ 256 while (count > 0) { \ 257 + if (get_user(data, ptr++)) \ 258 return -EFAULT; \ 259 data = convsample(data); \ 260 *high++ = data>>8; \ ··· 269 count = min_t(size_t, userCount, frameLeft)>>2 & ~1; \ 270 used = count*4; \ 271 while (count > 0) { \ 272 + if (get_user(data, ptr++)) \ 273 return -EFAULT; \ 274 data = convsample(data); \ 275 *lefth++ = data>>8; \ 276 *leftl++ = (data>>2) & 0x3f; \ 277 + if (get_user(data, ptr++)) \ 278 return -EFAULT; \ 279 data = convsample(data); \ 280 *righth++ = data>>8; \