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

s390/uaccess: whitespace cleanup

Whitespace cleanup to get rid if some checkpatch findings, but mainly
to have consistent coding style within the header file again.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

+66 -66
+66 -66
arch/s390/include/asm/uaccess.h
··· 3 3 * S390 version 4 4 * Copyright IBM Corp. 1999, 2000 5 5 * Author(s): Hartmut Penner (hp@de.ibm.com), 6 - * Martin Schwidefsky (schwidefsky@de.ibm.com) 6 + * Martin Schwidefsky (schwidefsky@de.ibm.com) 7 7 * 8 8 * Derived from "include/asm-i386/uaccess.h" 9 9 */ ··· 194 194 * These are the main single-value transfer routines. They automatically 195 195 * use the right size if we just have the right pointer type. 196 196 */ 197 - #define __put_user(x, ptr) \ 198 - ({ \ 199 - __typeof__(*(ptr)) __x = (x); \ 200 - int __pu_err = -EFAULT; \ 201 - __chk_user_ptr(ptr); \ 202 - switch (sizeof (*(ptr))) { \ 203 - case 1: \ 204 - case 2: \ 205 - case 4: \ 206 - case 8: \ 207 - __pu_err = __put_user_fn(&__x, ptr, \ 208 - sizeof(*(ptr))); \ 209 - break; \ 210 - default: \ 211 - __put_user_bad(); \ 212 - break; \ 213 - } \ 214 - __builtin_expect(__pu_err, 0); \ 197 + #define __put_user(x, ptr) \ 198 + ({ \ 199 + __typeof__(*(ptr)) __x = (x); \ 200 + int __pu_err = -EFAULT; \ 201 + \ 202 + __chk_user_ptr(ptr); \ 203 + switch (sizeof(*(ptr))) { \ 204 + case 1: \ 205 + case 2: \ 206 + case 4: \ 207 + case 8: \ 208 + __pu_err = __put_user_fn(&__x, ptr, sizeof(*(ptr))); \ 209 + break; \ 210 + default: \ 211 + __put_user_bad(); \ 212 + break; \ 213 + } \ 214 + __builtin_expect(__pu_err, 0); \ 215 215 }) 216 216 217 - #define put_user(x, ptr) \ 218 - ({ \ 219 - might_fault(); \ 220 - __put_user(x, ptr); \ 217 + #define put_user(x, ptr) \ 218 + ({ \ 219 + might_fault(); \ 220 + __put_user(x, ptr); \ 221 221 }) 222 222 223 - 224 - #define __get_user(x, ptr) \ 225 - ({ \ 226 - int __gu_err = -EFAULT; \ 227 - __chk_user_ptr(ptr); \ 228 - switch (sizeof(*(ptr))) { \ 229 - case 1: { \ 230 - unsigned char __x; \ 231 - __gu_err = __get_user_fn(&__x, ptr, \ 232 - sizeof(*(ptr))); \ 233 - (x) = *(__force __typeof__(*(ptr)) *) &__x; \ 234 - break; \ 235 - }; \ 236 - case 2: { \ 237 - unsigned short __x; \ 238 - __gu_err = __get_user_fn(&__x, ptr, \ 239 - sizeof(*(ptr))); \ 240 - (x) = *(__force __typeof__(*(ptr)) *) &__x; \ 241 - break; \ 242 - }; \ 243 - case 4: { \ 244 - unsigned int __x; \ 245 - __gu_err = __get_user_fn(&__x, ptr, \ 246 - sizeof(*(ptr))); \ 247 - (x) = *(__force __typeof__(*(ptr)) *) &__x; \ 248 - break; \ 249 - }; \ 250 - case 8: { \ 251 - unsigned long __x; \ 252 - __gu_err = __get_user_fn(&__x, ptr, \ 253 - sizeof(*(ptr))); \ 254 - (x) = *(__force __typeof__(*(ptr)) *) &__x; \ 255 - break; \ 256 - }; \ 257 - default: \ 258 - __get_user_bad(); \ 259 - break; \ 260 - } \ 261 - __builtin_expect(__gu_err, 0); \ 223 + #define __get_user(x, ptr) \ 224 + ({ \ 225 + int __gu_err = -EFAULT; \ 226 + \ 227 + __chk_user_ptr(ptr); \ 228 + switch (sizeof(*(ptr))) { \ 229 + case 1: { \ 230 + unsigned char __x; \ 231 + \ 232 + __gu_err = __get_user_fn(&__x, ptr, sizeof(*(ptr))); \ 233 + (x) = *(__force __typeof__(*(ptr)) *)&__x; \ 234 + break; \ 235 + }; \ 236 + case 2: { \ 237 + unsigned short __x; \ 238 + \ 239 + __gu_err = __get_user_fn(&__x, ptr, sizeof(*(ptr))); \ 240 + (x) = *(__force __typeof__(*(ptr)) *)&__x; \ 241 + break; \ 242 + }; \ 243 + case 4: { \ 244 + unsigned int __x; \ 245 + \ 246 + __gu_err = __get_user_fn(&__x, ptr, sizeof(*(ptr))); \ 247 + (x) = *(__force __typeof__(*(ptr)) *)&__x; \ 248 + break; \ 249 + }; \ 250 + case 8: { \ 251 + unsigned long __x; \ 252 + \ 253 + __gu_err = __get_user_fn(&__x, ptr, sizeof(*(ptr))); \ 254 + (x) = *(__force __typeof__(*(ptr)) *)&__x; \ 255 + break; \ 256 + }; \ 257 + default: \ 258 + __get_user_bad(); \ 259 + break; \ 260 + } \ 261 + __builtin_expect(__gu_err, 0); \ 262 262 }) 263 263 264 - #define get_user(x, ptr) \ 265 - ({ \ 266 - might_fault(); \ 267 - __get_user(x, ptr); \ 264 + #define get_user(x, ptr) \ 265 + ({ \ 266 + might_fault(); \ 267 + __get_user(x, ptr); \ 268 268 }) 269 269 270 270 /*