Commit e4372329 authored by Pankaj Bharadiya's avatar Pankaj Bharadiya Committed by Kees Cook
Browse files

MIPS: OCTEON: Replace SIZEOF_FIELD() macro 



Switch to the standard sizeof_field() macro to find the size of a member
of a struct and remove the custom SIZEOF_FIELD() macro.

Signed-off-by: default avatarPankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Link: https://lore.kernel.org/r/20190924105839.110713-4-pankaj.laxminarayan.bharadiya@intel.com


Co-developed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent e42617b8

arch/mips/cavium-octeon/executive/cvmx-bootmem.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -44,13 +44,6 @@ static struct cvmx_bootmem_desc *cvmx_bootmem_desc; 




/* See header file for descriptions of functions */

/* 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

 * This macro returns a member of the

 * cvmx_bootmem_named_block_desc_t structure. These members can't

 * 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)			\

#define CVMX_BOOTMEM_NAMED_GET_FIELD(addr, field)			\

	__cvmx_bootmem_desc_get(addr,					\

	__cvmx_bootmem_desc_get(addr,					\

		offsetof(struct cvmx_bootmem_named_block_desc, field),	\

		offsetof(struct cvmx_bootmem_named_block_desc, field),	\

		SIZEOF_FIELD(struct cvmx_bootmem_named_block_desc, field))

		sizeof_field(struct cvmx_bootmem_named_block_desc, field))





/**

/**

 * This function is the implementation of the get macros defined

 * This function is the implementation of the get macros defined

CRA Git | Maintained and supported by SUSTech CRA and CCSE