Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ccf7b25 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

sparc32: uaccess_32 macro whitespace fixes 



Macros within arch/sparc/include/asm/uaccess_32.h are made harder to
read because they violate a bunch of coding style rules.

Fix it up.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 99408c84

arch/sparc/include/asm/uaccess_32.h

+227 −138
Original line number Diff line number Diff line
@@ -94,20 +94,24 @@ void __ret_efault(void); 
#define put_user(x, ptr) ({ \

	unsigned long __pu_addr = (unsigned long)(ptr); \

	__chk_user_ptr(ptr); \

__put_user_check((__typeof__(*(ptr)))(x),__pu_addr,sizeof(*(ptr))); })

	__put_user_check((__typeof__(*(ptr)))(x), __pu_addr, sizeof(*(ptr))); \

})



#define get_user(x, ptr) ({ \

	unsigned long __gu_addr = (unsigned long)(ptr); \

	__chk_user_ptr(ptr); \

__get_user_check((x),__gu_addr,sizeof(*(ptr)),__typeof__(*(ptr))); })

	__get_user_check((x), __gu_addr, sizeof(*(ptr)), __typeof__(*(ptr))); \

})



/*

 * The "__xxx" versions do not do address space checking, useful when

 * doing multiple accesses to the same area (the user has to do the

 * checks by hand with "access_ok()")

 */

#define __put_user(x,ptr) __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))

#define __get_user(x,ptr) __get_user_nocheck((x),(ptr),sizeof(*(ptr)),__typeof__(*(ptr)))

#define __put_user(x, ptr) \

	__put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))

#define __get_user(x, ptr) \

    __get_user_nocheck((x), (ptr), sizeof(*(ptr)), __typeof__(*(ptr)))



struct __large_struct { unsigned long buf[100]; };

#define __m(x) ((struct __large_struct __user *)(x))
@@ -116,22 +120,49 @@ struct __large_struct { unsigned long buf[100]; }; 
	register int __pu_ret; \

	if (__access_ok(addr, size)) { \

		switch (size) { \

case 1: __put_user_asm(x,b,addr,__pu_ret); break; \

case 2: __put_user_asm(x,h,addr,__pu_ret); break; \

case 4: __put_user_asm(x,,addr,__pu_ret); break; \

case 8: __put_user_asm(x,d,addr,__pu_ret); break; \

default: __pu_ret = __put_user_bad(); break; \

} } else { __pu_ret = -EFAULT; } __pu_ret; })

		case 1: \

			__put_user_asm(x, b, addr, __pu_ret); \

			break; \

		case 2: \

			__put_user_asm(x, h, addr, __pu_ret); \

			break; \

		case 4: \

			__put_user_asm(x, , addr, __pu_ret); \

			break; \

		case 8: \

			__put_user_asm(x, d, addr, __pu_ret); \

			break; \

		default: \

			__pu_ret = __put_user_bad(); \

			break; \

		} \

	} else { \

		__pu_ret = -EFAULT; \

	} \

	__pu_ret; \

})



#define __put_user_nocheck(x, addr, size) ({ \

	register int __pu_ret; \

	switch (size) { \

case 1: __put_user_asm(x,b,addr,__pu_ret); break; \

case 2: __put_user_asm(x,h,addr,__pu_ret); break; \

case 4: __put_user_asm(x,,addr,__pu_ret); break; \

case 8: __put_user_asm(x,d,addr,__pu_ret); break; \

default: __pu_ret = __put_user_bad(); break; \

} __pu_ret; })

	case 1: \

		__put_user_asm(x, b, addr, __pu_ret); \

		break; \

	case 2: \

		__put_user_asm(x, h, addr, __pu_ret); \

		break; \

	case 4: \

		__put_user_asm(x, , addr, __pu_ret); \

		break; \

	case 8: \

		__put_user_asm(x, d, addr, __pu_ret); \

		break; \

	default: \

		__pu_ret = __put_user_bad(); \

		break; \

	} \

	__pu_ret; \

})



#define __put_user_asm(x, size, addr, ret)				\

__asm__ __volatile__(							\
@@ -159,44 +190,102 @@ register int __gu_ret; \ 
	register unsigned long __gu_val; \

	if (__access_ok(addr, size)) { \

		switch (size) { \

case 1: __get_user_asm(__gu_val,ub,addr,__gu_ret); break; \

case 2: __get_user_asm(__gu_val,uh,addr,__gu_ret); break; \

case 4: __get_user_asm(__gu_val,,addr,__gu_ret); break; \

case 8: __get_user_asm(__gu_val,d,addr,__gu_ret); break; \

default: __gu_val = 0; __gu_ret = __get_user_bad(); break; \

} } else { __gu_val = 0; __gu_ret = -EFAULT; } x = (__force type) __gu_val; __gu_ret; })

		case 1: \

			 __get_user_asm(__gu_val, ub, addr, __gu_ret); \

			break; \

		case 2: \

			__get_user_asm(__gu_val, uh, addr, __gu_ret); \

			break; \

		case 4: \

			__get_user_asm(__gu_val, , addr, __gu_ret); \

			break; \

		case 8: \

			__get_user_asm(__gu_val, d, addr, __gu_ret); \

			break; \

		default: \

			__gu_val = 0; \

			__gu_ret = __get_user_bad(); \

			break; \

		} \

	 } else { \

		 __gu_val = 0; \

		 __gu_ret = -EFAULT; \

	} \

	x = (__force type) __gu_val; \

	__gu_ret; \

})



#define __get_user_check_ret(x, addr, size, type, retval) ({ \

	register unsigned long __gu_val __asm__ ("l1"); \

	if (__access_ok(addr, size)) { \

		switch (size) { \

case 1: __get_user_asm_ret(__gu_val,ub,addr,retval); break; \

case 2: __get_user_asm_ret(__gu_val,uh,addr,retval); break; \

case 4: __get_user_asm_ret(__gu_val,,addr,retval); break; \

case 8: __get_user_asm_ret(__gu_val,d,addr,retval); break; \

default: if (__get_user_bad()) return retval; \

} x = (__force type) __gu_val; } else return retval; })

		case 1: \

			__get_user_asm_ret(__gu_val, ub, addr, retval); \

			break; \

		case 2: \

			__get_user_asm_ret(__gu_val, uh, addr, retval); \

			break; \

		case 4: \

			__get_user_asm_ret(__gu_val, , addr, retval); \

			break; \

		case 8: \

			__get_user_asm_ret(__gu_val, d, addr, retval); \

			break; \

		default: \

			if (__get_user_bad()) \

				return retval; \

		} \

		x = (__force type) __gu_val; \

	} else \

		return retval; \

})



#define __get_user_nocheck(x, addr, size, type) ({ \

	register int __gu_ret; \

	register unsigned long __gu_val; \

	switch (size) { \

case 1: __get_user_asm(__gu_val,ub,addr,__gu_ret); break; \

case 2: __get_user_asm(__gu_val,uh,addr,__gu_ret); break; \

case 4: __get_user_asm(__gu_val,,addr,__gu_ret); break; \

case 8: __get_user_asm(__gu_val,d,addr,__gu_ret); break; \

default: __gu_val = 0; __gu_ret = __get_user_bad(); break; \

} x = (__force type) __gu_val; __gu_ret; })

	case 1: \

		__get_user_asm(__gu_val, ub, addr, __gu_ret); \

		break; \

	case 2: \

		__get_user_asm(__gu_val, uh, addr, __gu_ret); \

		break; \

	case 4: \

		__get_user_asm(__gu_val, , addr, __gu_ret); \

		break; \

	case 8: \

		__get_user_asm(__gu_val, d, addr, __gu_ret); \

		break; \

	default: \

		__gu_val = 0; \

		__gu_ret = __get_user_bad(); \

		break; \

	} \

	x = (__force type) __gu_val; \

	__gu_ret; \

})



#define __get_user_nocheck_ret(x, addr, size, type, retval) ({ \

	register unsigned long __gu_val __asm__ ("l1"); \

	switch (size) { \

case 1: __get_user_asm_ret(__gu_val,ub,addr,retval); break; \

case 2: __get_user_asm_ret(__gu_val,uh,addr,retval); break; \

case 4: __get_user_asm_ret(__gu_val,,addr,retval); break; \

case 8: __get_user_asm_ret(__gu_val,d,addr,retval); break; \

default: if (__get_user_bad()) return retval; \

} x = (__force type) __gu_val; })

	case 1: \

		__get_user_asm_ret(__gu_val, ub, addr, retval); \

		break; \

	case 2: \

		__get_user_asm_ret(__gu_val, uh, addr, retval); \

		break; \

	case 4: \

		__get_user_asm_ret(__gu_val, , addr, retval); \

		break; \

	case 8: \

		__get_user_asm_ret(__gu_val, d, addr, retval); \

		break; \

	default: \

		if (__get_user_bad()) \

			return retval; \

	} \

	x = (__force type) __gu_val; \

})



#define __get_user_asm(x, size, addr, ret)				\

__asm__ __volatile__(							\