MIPS: OCTEON: Replace SIZEOF_FIELD() macro
diff mbox series

Message ID 201910101545.586BCFC@keescook
State In Next
Commit de5f91c49a158ffd5d6a5784283a348f6c6ef705
Headers show
Series
  • MIPS: OCTEON: Replace SIZEOF_FIELD() macro
Related show

Commit Message

Kees Cook Oct. 10, 2019, 10:46 p.m. UTC
From: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>

In preparation for switching to a standard sizeof_member() macro to find the
size of a member of a struct, remove the custom SIZEOF_FIELD() macro and use
the more common FIELD_SIZEOF() instead. Later patches will globally replace
FIELD_SIZEOF() and sizeof_field() with the more accurate sizeof_member().

Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Link: https://lore.kernel.org/r/20190924105839.110713-4-pankaj.laxminarayan.bharadiya@intel.com
Co-developed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
 arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

Comments

Joe Perches Oct. 10, 2019, 11:02 p.m. UTC | #1
On Thu, 2019-10-10 at 15:46 -0700, Kees Cook wrote:
> In preparation for switching to a standard sizeof_member() macro to find the
> size of a member of a struct, remove the custom SIZEOF_FIELD() macro and use
> the more common FIELD_SIZEOF() instead. Later patches will globally replace
> FIELD_SIZEOF() and sizeof_field() with the more accurate sizeof_member().

Is the intent to have a single treewide flag day conversion of
FIELD_SIZEOF -> sizeof_member or submit individual patches to
subsystem maintainers?

I don't recall Linus buying in to either mechanism.

Patch
diff mbox series

diff --git a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c
index ba8f82a29a81..44b506a14666 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c
@@ -44,13 +44,6 @@  static struct cvmx_bootmem_desc *cvmx_bootmem_desc;
 
 /* See header file for descriptions of functions */
 
-/**
- * This macro returns the size of a member of a structure.
- * Logically it is the same as "sizeof(s::field)" in C++, but
- * C lacks the "::" operator.
- */
-#define SIZEOF_FIELD(s, field) sizeof(((s *)NULL)->field)
-
 /**
  * This macro returns a member of the
  * cvmx_bootmem_named_block_desc_t structure. These members can't
@@ -65,7 +58,7 @@  static struct cvmx_bootmem_desc *cvmx_bootmem_desc;
 #define CVMX_BOOTMEM_NAMED_GET_FIELD(addr, field)			\
 	__cvmx_bootmem_desc_get(addr,					\
 		offsetof(struct cvmx_bootmem_named_block_desc, field),	\
-		SIZEOF_FIELD(struct cvmx_bootmem_named_block_desc, field))
+		FIELD_SIZEOF(struct cvmx_bootmem_named_block_desc, field))
 
 /**
  * This function is the implementation of the get macros defined