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

Commit 7185820a authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

sparc64: uaccess_64 macro whitespace fixes 



Macros within arch/sparc/include/asm/uaccess_64.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 8ccf7b25

arch/sparc/include/asm/uaccess_64.h

+144 −104
Original line number Diff line number Diff line
@@ -91,12 +91,14 @@ void __retl_efault(void); 
#define put_user(x, ptr) ({ \

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

	__chk_user_ptr(ptr); \

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

	__put_user_nocheck((__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_nocheck((x),__gu_addr,sizeof(*(ptr)),__typeof__(*(ptr))); })

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

})



#define __put_user(x, ptr) put_user(x, ptr)

#define __get_user(x, ptr) get_user(x, ptr)
@@ -107,12 +109,24 @@ struct __large_struct { unsigned long buf[100]; }; 
#define __put_user_nocheck(data, addr, size) ({ \

	register int __pu_ret; \

	switch (size) { \

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

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

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

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

default: __pu_ret = __put_user_bad(); break; \

} __pu_ret; })

	case 1: \

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

		break; \

	case 2: \

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

		break; \

	case 4: \

		__put_user_asm(data, w, addr, __pu_ret); \

		break; \

	case 8: \

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

		break; \

	default: \

		__pu_ret = __put_user_bad(); \

		break; \

	} \

	__pu_ret; \

})



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

__asm__ __volatile__(							\
@@ -140,22 +154,48 @@ int __put_user_bad(void); 
	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,uw,addr,__gu_ret); break; \

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

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

} data = (__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, uw, addr, __gu_ret); \

			break; \

		case 8: \

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

			break; \

		default: \

			__gu_val = 0; \

			__gu_ret = __get_user_bad(); \

			break; \

	} \

	data = (__force type) __gu_val; \

	 __gu_ret; \

})



#define __get_user_nocheck_ret(data, 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,uw,addr,retval); break; \

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

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

} data = (__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, uw, addr, retval); \

		break; \

	case 8: \

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

		break; \

	default: \

		if (__get_user_bad()) \

			return retval; \

	} \

	data = (__force type) __gu_val; \

})



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

__asm__ __volatile__(							\