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

Commit 4b636ba2 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

sparc64: nocheck uaccess coding style tweaks 



Sam Ravnborg suggested packing single-lines cases in switch statements
in nocheck uaccess macros makes for easier to read code.

Suggested-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 33a3dcc2

arch/sparc/include/asm/uaccess_64.h

+37 −63
Original line number Diff line number Diff line
@@ -109,21 +109,11 @@ 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; \

	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;						\

})
@@ -154,18 +144,10 @@ 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; \

		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();			     \
@@ -178,18 +160,10 @@ int __put_user_bad(void); 
#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; \

	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;					\