diff --git a/paddle/pten/core/tensor_meta.h b/paddle/pten/core/tensor_meta.h
index 18daabca038ce13b0704fbb45b9541f95e97f01c..5341c6bff54498e22a1a2a11428121c9ed7ffc2d 100644
--- a/paddle/pten/core/tensor_meta.h
+++ b/paddle/pten/core/tensor_meta.h
@@ -61,8 +61,7 @@ struct DenseTensorMeta {
 };
 
 inline bool operator==(const DenseTensorMeta& lhs, const DenseTensorMeta& rhs) {
-  bool ret = true;
-  return ret && (lhs.is_scalar == rhs.is_scalar) && (lhs.dims == rhs.dims) &&
+  return (lhs.is_scalar == rhs.is_scalar) && (lhs.dims == rhs.dims) &&
          (lhs.dtype == rhs.dtype) && (lhs.layout == rhs.layout) &&
          (lhs.lod == rhs.lod) && (lhs.offset == rhs.offset);
 }
diff --git a/paddle/pten/kernels/flatten_kernel.cc b/paddle/pten/kernels/flatten_kernel.cc
index 98df9b93d27763c6d14f69ccb0faf522463b314b..025dc8a83294901cc046cd63f1c53635d1167120 100644
--- a/paddle/pten/kernels/flatten_kernel.cc
+++ b/paddle/pten/kernels/flatten_kernel.cc
@@ -17,7 +17,7 @@
 #include "paddle/pten/core/kernel_registry.h"
 #include "paddle/pten/infermeta/unary.h"
 #include "paddle/pten/kernels/cpu/utils.h"
-#include "paddle/pten/kernels/functions/common_shape.h"
+#include "paddle/pten/kernels/funcs/common_shape.h"
 #include "paddle/pten/kernels/gpu/utils.h"
 #include "paddle/pten/kernels/xpu/utils.h"
 
diff --git a/paddle/pten/kernels/functions/common_shape.h b/paddle/pten/kernels/funcs/common_shape.h
similarity index 100%
rename from paddle/pten/kernels/functions/common_shape.h
rename to paddle/pten/kernels/funcs/common_shape.h