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

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

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>

diff --git a/include/linux/cleanup.h b/include/linux/cleanup.h
index 0b55a8f6c59e1a836b1eb8d77d9cdef21a032f96..8d41b917c77d5a1bcd442bd06d5da3cdba210ed3 100644 (file)
--- a/include/linux/cleanup.h
+++ b/include/linux/cleanup.h
@@ -212,10 +212,10 @@
 
 #define __free(_name)  __cleanup(__free_##_name)
 
-#define __get_and_null(p, nullvalue)   \
+#define __get_and_null(p, nullvalue)       \
        ({                                  \
-               __auto_type __ptr = &(p);   \
-               __auto_type __val = *__ptr; \
+               auto __ptr = &(p);          \
+               auto __val = *__ptr;        \
                *__ptr = nullvalue;         \
                __val;                      \
        })

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index ff71bebe56f5cf46f3d8447a56890ca0c944d4f2..04487c9bd7510cf2ef803f5f29af32c87dd1e751 100644 (file)
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -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;                                                            \
 })

diff --git a/include/linux/minmax.h b/include/linux/minmax.h
index eaaf5c008e4d056c94861fe6fb6682dfd5cd4e21..a0158db54a04117d2ce8a72f22dafc4df8299c3a 100644 (file)
--- a/include/linux/minmax.h
+++ b/include/linux/minmax.h
@@ -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