aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2008-10-17 13:56:00 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-22 12:56:35 -0400
commit6675fe3f92ad3b433e55744ef96d775b4875997e (patch)
tree18a442789ccfd6338488487e3226356c10b222e3
parentf07639adebd573709ea0d6b67bec9b620fe3083e (diff)
Staging: echo: remove __cplusplus macro magic
The kernel is written in C, so remove the __cplusplus macro magic from the driver. Cc: David Rowe <david@rowetel.com> Cc: Steve Underwood <steveu@coppice.org> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/echo/bit_operations.h8
-rw-r--r--drivers/staging/echo/fir.h8
2 files changed, 0 insertions, 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 @@
30#if !defined(_BIT_OPERATIONS_H_) 30#if !defined(_BIT_OPERATIONS_H_)
31#define _BIT_OPERATIONS_H_ 31#define _BIT_OPERATIONS_H_
32 32
33#ifdef __cplusplus
34extern "C" {
35#endif
36
37#if defined(__i386__) || defined(__x86_64__) 33#if defined(__i386__) || defined(__x86_64__)
38/*! \brief Find the bit position of the highest set bit in a word 34/*! \brief Find the bit position of the highest set bit in a word
39 \param bits The word to be searched 35 \param bits The word to be searched
@@ -245,9 +241,5 @@ static __inline__ int parity32(uint32_t x)
245} 241}
246/*- End of function --------------------------------------------------------*/ 242/*- End of function --------------------------------------------------------*/
247 243
248#ifdef __cplusplus
249}
250#endif
251
252#endif 244#endif
253/*- End of file ------------------------------------------------------------*/ 245/*- 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
105 float *history; 105 float *history;
106} fir_float_state_t; 106} fir_float_state_t;
107 107
108#ifdef __cplusplus
109extern "C" {
110#endif
111
112static __inline__ const int16_t *fir16_create(fir16_state_t *fir, 108static __inline__ const int16_t *fir16_create(fir16_state_t *fir,
113 const int16_t *coeffs, 109 const int16_t *coeffs,
114 int taps) 110 int taps)
@@ -312,9 +308,5 @@ static __inline__ int16_t fir32(fir32_state_t *fir, int16_t sample)
312} 308}
313/*- End of function --------------------------------------------------------*/ 309/*- End of function --------------------------------------------------------*/
314 310
315#ifdef __cplusplus
316}
317#endif
318
319#endif 311#endif
320/*- End of file ------------------------------------------------------------*/ 312/*- End of file ------------------------------------------------------------*/