Commit b3b8767c authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

include/linux: change "__auto_type" to "auto" 



Replace instances of "__auto_type" with "auto" in include/linux.

Signed-off-by: default avatarH. Peter Anvin (Intel) <hpa@zytor.com>
parent 2fb6915f

include/linux/cleanup.h

+3 −3
Original line number Diff line number Diff line
@@ -214,8 +214,8 @@ 


#define __get_and_null(p, nullvalue)	    \

	({                                  \

		__auto_type __ptr = &(p);   \

		__auto_type __val = *__ptr; \

		auto __ptr = &(p);	    \

		auto __val = *__ptr;	    \

		*__ptr = nullvalue;         \

		__val;                      \

	})

include/linux/compiler.h

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, 
#define data_race(expr)							\

({									\

	__kcsan_disable_current();					\

	__auto_type __v = (expr);					\

	auto __v = (expr);						\

	__kcsan_enable_current();					\

	__v;								\

})

include/linux/minmax.h

+3 −3
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
	__cmp_once_unique(op, type, x, y, __UNIQUE_ID(x_), __UNIQUE_ID(y_))



#define __careful_cmp_once(op, x, y, ux, uy) ({		\

	__auto_type ux = (x); __auto_type uy = (y);	\

	auto ux = (x); auto uy = (y);			\

	BUILD_BUG_ON_MSG(!__types_ok(ux, uy),		\

		#op"("#x", "#y") signedness error");	\

	__cmp(op, ux, uy); })
@@ -129,7 +129,7 @@ 
	__careful_cmp(max, (x) + 0u + 0ul + 0ull, (y) + 0u + 0ul + 0ull)



#define __careful_op3(op, x, y, z, ux, uy, uz) ({			\

	__auto_type ux = (x); __auto_type uy = (y);__auto_type uz = (z);\

	auto ux = (x); auto uy = (y); auto uz = (z);			\

	BUILD_BUG_ON_MSG(!__types_ok3(ux, uy, uz),			\

		#op"3("#x", "#y", "#z") signedness error");		\

	__cmp(op, ux, __cmp(op, uy, uz)); })
@@ -203,7 +203,7 @@ 
 * This macro checks @val/@lo/@hi to make sure they have compatible

 * signedness.

 */

#define clamp(val, lo, hi) __careful_clamp(__auto_type, val, lo, hi)

#define clamp(val, lo, hi) __careful_clamp(auto, val, lo, hi)



/**

 * clamp_t - return a value clamped to a given range using a given type