[PATCH 24/42] Staging: echo: remove __cplusplus macro magic

From: Greg Kroah-Hartman
Date: Wed Oct 22 2008 - 13:42:01 EST


From: Pekka Enberg <penberg@xxxxxxxxxxxxxx>

The kernel is written in C, so remove the __cplusplus macro magic from the
driver.

Cc: David Rowe <david@xxxxxxxxxxx>
Cc: Steve Underwood <steveu@xxxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/staging/echo/bit_operations.h | 8 --------
drivers/staging/echo/fir.h | 8 --------
2 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/echo/bit_operations.h b/drivers/staging/echo/bit_operations.h
index b32f4bf..04b55d2 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 19c20cd..d1df33c 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 ------------------------------------------------------------*/
--
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/