Re: [PATCH] mpilib: use 'static inline' for mpi-inline.h

Steven Rostedt
2014-05-08T15:30:19Z

On Thu, 8 May 2014 16:56:20 +0200
Arnd Bergmann <arnd@arndb.de> wrote:

> Four functions of mpilib are defined as 'extern inline' at the
> moment, which is generally not the correct way to do inline functions
> using gcc.

I think clang would appreciate this too.

-- Steve

>
> While this is usually harmless, it shows up as a warning in combination
> with the CONFIG_PROFILE_ALL_BRANCHES, resulting in very many lines
> like:
>
> /git/arm-soc/lib/mpi/mpi-inline.h:70:182: warning: '______f' is static but declared in inline function 'mpihelp_add' which is not static [enabled by default]
>
> Using static inline makes the code behave as expected and gets
> rid of the warning
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Steven Rostedt <rostedt@goodmis.org>
> Cc: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
> ---
> lib/mpi/mpi-inline.h | 2 +-
> lib/mpi/mpi-internal.h | 8 --------
> 2 files changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h
> index e2b3985..c245ea3 100644
> --- a/lib/mpi/mpi-inline.h
> +++ b/lib/mpi/mpi-inline.h
> @@ -30,7 +30,7 @@
> #define G10_MPI_INLINE_H
>
> #ifndef G10_MPI_INLINE_DECL
> -#define G10_MPI_INLINE_DECL extern inline
> +#define G10_MPI_INLINE_DECL static inline
> #endif
>
> G10_MPI_INLINE_DECL mpi_limb_t
> diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h
> index 60cf765..54c1e97 100644
> --- a/lib/mpi/mpi-internal.h
> +++ b/lib/mpi/mpi-internal.h
> @@ -168,20 +168,12 @@ void mpi_rshift_limbs(MPI a, unsigned int count);
> int mpi_lshift_limbs(MPI a, unsigned int count);
>
> /*-- mpihelp-add.c --*/
> -mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
> - mpi_size_t s1_size, mpi_limb_t s2_limb);
> mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
> mpi_ptr_t s2_ptr, mpi_size_t size);
> -mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
> - mpi_ptr_t s2_ptr, mpi_size_t s2_size);
>
> /*-- mpihelp-sub.c --*/
> -mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
> - mpi_size_t s1_size, mpi_limb_t s2_limb);
> mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
> mpi_ptr_t s2_ptr, mpi_size_t size);
> -mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
> - mpi_ptr_t s2_ptr, mpi_size_t s2_size);
>
> /*-- mpihelp-cmp.c --*/
> int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size);