From 6675fe3f92ad3b433e55744ef96d775b4875997e Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Fri, 17 Oct 2008 20:56:00 +0300 Subject: [PATCH] Staging: echo: remove __cplusplus macro magic The kernel is written in C, so remove the __cplusplus macro magic from the driver. Cc: David Rowe Cc: Steve Underwood Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman --- drivers/staging/echo/bit_operations.h | 8 -------- drivers/staging/echo/fir.h | 8 -------- 2 files changed, 16 deletions(-) diff --git a/drivers/staging/echo/bit_operations.h b/drivers/staging/echo/bit_operations.h index b32f4bf99397..04b55d2aba59 100644 --- a/drivers/staging/echo/bit_operations.h +++ b/drivers/staging/echo/bit_operations.h @@ -30,10 +30,6 @@ #if !defined(_BIT_OPERATIONS_H_) #define _BIT_OPERATIONS_H_ -#ifdef __cplusplus -extern "C" { -#endif - #if defined(__i386__) || defined(__x86_64__) /*! \brief Find the bit position of the highest set bit in a word \param bits The word to be searched @@ -245,9 +241,5 @@ static __inline__ int parity32(uint32_t x) } /*- End of function --------------------------------------------------------*/ -#ifdef __cplusplus -} -#endif - #endif /*- End of file ------------------------------------------------------------*/ diff --git a/drivers/staging/echo/fir.h b/drivers/staging/echo/fir.h index 19c20cde186b..d1df33cf2aa5 100644 --- a/drivers/staging/echo/fir.h +++ b/drivers/staging/echo/fir.h @@ -105,10 +105,6 @@ typedef struct float *history; } fir_float_state_t; -#ifdef __cplusplus -extern "C" { -#endif - static __inline__ const int16_t *fir16_create(fir16_state_t *fir, const int16_t *coeffs, int taps) @@ -312,9 +308,5 @@ static __inline__ int16_t fir32(fir32_state_t *fir, int16_t sample) } /*- End of function --------------------------------------------------------*/ -#ifdef __cplusplus -} -#endif - #endif /*- End of file ------------------------------------------------------------*/ -- 2.20.1