aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2008-10-17 13:57:08 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-22 12:56:35 -0400
commit1781ad2f6338d1c0636a47faf34958da7861be1c (patch)
treed2ea9cbcbf1715e96d6b65c248f29da996afb74a /drivers/staging
parent6675fe3f92ad3b433e55744ef96d775b4875997e (diff)
Staging: echo: remove annoying "end of function" markers
This patch removes the very noisy "end of function" markers that are very annoying when reading the driver code. 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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/echo/bit_operations.h10
-rw-r--r--drivers/staging/echo/echo.c7
-rw-r--r--drivers/staging/echo/fir.h9
3 files changed, 0 insertions, 26 deletions
diff --git a/drivers/staging/echo/bit_operations.h b/drivers/staging/echo/bit_operations.h
index 04b55d2aba5..abcd7a2168a 100644
--- a/drivers/staging/echo/bit_operations.h
+++ b/drivers/staging/echo/bit_operations.h
@@ -45,7 +45,6 @@ static __inline__ int top_bit(unsigned int bits)
45 : [bits] "rm" (bits)); 45 : [bits] "rm" (bits));
46 return res; 46 return res;
47} 47}
48/*- End of function --------------------------------------------------------*/
49 48
50/*! \brief Find the bit position of the lowest set bit in a word 49/*! \brief Find the bit position of the lowest set bit in a word
51 \param bits The word to be searched 50 \param bits The word to be searched
@@ -61,7 +60,6 @@ static __inline__ int bottom_bit(unsigned int bits)
61 : [bits] "rm" (bits)); 60 : [bits] "rm" (bits));
62 return res; 61 return res;
63} 62}
64/*- End of function --------------------------------------------------------*/
65#else 63#else
66static __inline__ int top_bit(unsigned int bits) 64static __inline__ int top_bit(unsigned int bits)
67{ 65{
@@ -97,7 +95,6 @@ static __inline__ int top_bit(unsigned int bits)
97 } 95 }
98 return i; 96 return i;
99} 97}
100/*- End of function --------------------------------------------------------*/
101 98
102static __inline__ int bottom_bit(unsigned int bits) 99static __inline__ int bottom_bit(unsigned int bits)
103{ 100{
@@ -133,7 +130,6 @@ static __inline__ int bottom_bit(unsigned int bits)
133 } 130 }
134 return i; 131 return i;
135} 132}
136/*- End of function --------------------------------------------------------*/
137#endif 133#endif
138 134
139/*! \brief Bit reverse a byte. 135/*! \brief Bit reverse a byte.
@@ -151,7 +147,6 @@ static __inline__ uint8_t bit_reverse8(uint8_t x)
151 return ((x & 0xAA) >> 1) | ((x & 0x55) << 1); 147 return ((x & 0xAA) >> 1) | ((x & 0x55) << 1);
152#endif 148#endif
153} 149}
154/*- End of function --------------------------------------------------------*/
155 150
156/*! \brief Bit reverse a 16 bit word. 151/*! \brief Bit reverse a 16 bit word.
157 \param data The word to be reversed. 152 \param data The word to be reversed.
@@ -191,7 +186,6 @@ static __inline__ uint32_t least_significant_one32(uint32_t x)
191{ 186{
192 return (x & (-(int32_t) x)); 187 return (x & (-(int32_t) x));
193} 188}
194/*- End of function --------------------------------------------------------*/
195 189
196/*! \brief Find the most significant one in a word, and return a word 190/*! \brief Find the most significant one in a word, and return a word
197 with just that bit set. 191 with just that bit set.
@@ -206,7 +200,6 @@ static __inline__ uint32_t most_significant_one32(uint32_t x)
206 return (x ^ (x >> 1)); 200 return (x ^ (x >> 1));
207#endif 201#endif
208} 202}
209/*- End of function --------------------------------------------------------*/
210 203
211/*! \brief Find the parity of a byte. 204/*! \brief Find the parity of a byte.
212 \param x The byte to be checked. 205 \param x The byte to be checked.
@@ -216,7 +209,6 @@ static __inline__ int parity8(uint8_t x)
216 x = (x ^ (x >> 4)) & 0x0F; 209 x = (x ^ (x >> 4)) & 0x0F;
217 return (0x6996 >> x) & 1; 210 return (0x6996 >> x) & 1;
218} 211}
219/*- End of function --------------------------------------------------------*/
220 212
221/*! \brief Find the parity of a 16 bit word. 213/*! \brief Find the parity of a 16 bit word.
222 \param x The word to be checked. 214 \param x The word to be checked.
@@ -227,7 +219,6 @@ static __inline__ int parity16(uint16_t x)
227 x = (x ^ (x >> 4)) & 0x0F; 219 x = (x ^ (x >> 4)) & 0x0F;
228 return (0x6996 >> x) & 1; 220 return (0x6996 >> x) & 1;
229} 221}
230/*- End of function --------------------------------------------------------*/
231 222
232/*! \brief Find the parity of a 32 bit word. 223/*! \brief Find the parity of a 32 bit word.
233 \param x The word to be checked. 224 \param x The word to be checked.
@@ -239,7 +230,6 @@ static __inline__ int parity32(uint32_t x)
239 x = (x ^ (x >> 4)) & 0x0F; 230 x = (x ^ (x >> 4)) & 0x0F;
240 return (0x6996 >> x) & 1; 231 return (0x6996 >> x) & 1;
241} 232}
242/*- End of function --------------------------------------------------------*/
243 233
244#endif 234#endif
245/*- End of file ------------------------------------------------------------*/ 235/*- End of file ------------------------------------------------------------*/
diff --git a/drivers/staging/echo/echo.c b/drivers/staging/echo/echo.c
index a2d307865ea..ad18a959393 100644
--- a/drivers/staging/echo/echo.c
+++ b/drivers/staging/echo/echo.c
@@ -230,7 +230,6 @@ static __inline__ void lms_adapt_bg(struct oslec_state *ec, int clean, int shift
230} 230}
231#endif 231#endif
232 232
233/*- End of function --------------------------------------------------------*/
234 233
235struct oslec_state *oslec_create(int len, int adaption_mode) 234struct oslec_state *oslec_create(int len, int adaption_mode)
236{ 235{
@@ -288,7 +287,6 @@ error_oom:
288 return NULL; 287 return NULL;
289} 288}
290EXPORT_SYMBOL_GPL(oslec_create); 289EXPORT_SYMBOL_GPL(oslec_create);
291/*- End of function --------------------------------------------------------*/
292 290
293void oslec_free(struct oslec_state *ec) 291void oslec_free(struct oslec_state *ec)
294{ 292{
@@ -302,14 +300,12 @@ void oslec_free(struct oslec_state *ec)
302 kfree(ec); 300 kfree(ec);
303} 301}
304EXPORT_SYMBOL_GPL(oslec_free); 302EXPORT_SYMBOL_GPL(oslec_free);
305/*- End of function --------------------------------------------------------*/
306 303
307void oslec_adaption_mode(struct oslec_state *ec, int adaption_mode) 304void oslec_adaption_mode(struct oslec_state *ec, int adaption_mode)
308{ 305{
309 ec->adaption_mode = adaption_mode; 306 ec->adaption_mode = adaption_mode;
310} 307}
311EXPORT_SYMBOL_GPL(oslec_adaption_mode); 308EXPORT_SYMBOL_GPL(oslec_adaption_mode);
312/*- End of function --------------------------------------------------------*/
313 309
314void oslec_flush(struct oslec_state *ec) 310void oslec_flush(struct oslec_state *ec)
315{ 311{
@@ -336,13 +332,11 @@ void oslec_flush(struct oslec_state *ec)
336 ec->Pstates = 0; 332 ec->Pstates = 0;
337} 333}
338EXPORT_SYMBOL_GPL(oslec_flush); 334EXPORT_SYMBOL_GPL(oslec_flush);
339/*- End of function --------------------------------------------------------*/
340 335
341void oslec_snapshot(struct oslec_state *ec) { 336void oslec_snapshot(struct oslec_state *ec) {
342 memcpy(ec->snapshot, ec->fir_taps16[0], ec->taps*sizeof(int16_t)); 337 memcpy(ec->snapshot, ec->fir_taps16[0], ec->taps*sizeof(int16_t));
343} 338}
344EXPORT_SYMBOL_GPL(oslec_snapshot); 339EXPORT_SYMBOL_GPL(oslec_snapshot);
345/*- End of function --------------------------------------------------------*/
346 340
347/* Dual Path Echo Canceller ------------------------------------------------*/ 341/* Dual Path Echo Canceller ------------------------------------------------*/
348 342
@@ -588,7 +582,6 @@ int16_t oslec_update(struct oslec_state *ec, int16_t tx, int16_t rx)
588 return (int16_t) ec->clean_nlp << 1; 582 return (int16_t) ec->clean_nlp << 1;
589} 583}
590EXPORT_SYMBOL_GPL(oslec_update); 584EXPORT_SYMBOL_GPL(oslec_update);
591/*- End of function --------------------------------------------------------*/
592 585
593/* This function is seperated from the echo canceller is it is usually called 586/* This function is seperated from the echo canceller is it is usually called
594 as part of the tx process. See rx HP (DC blocking) filter above, it's 587 as part of the tx process. See rx HP (DC blocking) filter above, it's
diff --git a/drivers/staging/echo/fir.h b/drivers/staging/echo/fir.h
index d1df33cf2aa..e760471e481 100644
--- a/drivers/staging/echo/fir.h
+++ b/drivers/staging/echo/fir.h
@@ -119,7 +119,6 @@ static __inline__ const int16_t *fir16_create(fir16_state_t *fir,
119#endif 119#endif
120 return fir->history; 120 return fir->history;
121} 121}
122/*- End of function --------------------------------------------------------*/
123 122
124static __inline__ void fir16_flush(fir16_state_t *fir) 123static __inline__ void fir16_flush(fir16_state_t *fir)
125{ 124{
@@ -129,13 +128,11 @@ static __inline__ void fir16_flush(fir16_state_t *fir)
129 memset(fir->history, 0, fir->taps*sizeof(int16_t)); 128 memset(fir->history, 0, fir->taps*sizeof(int16_t));
130#endif 129#endif
131} 130}
132/*- End of function --------------------------------------------------------*/
133 131
134static __inline__ void fir16_free(fir16_state_t *fir) 132static __inline__ void fir16_free(fir16_state_t *fir)
135{ 133{
136 kfree(fir->history); 134 kfree(fir->history);
137} 135}
138/*- End of function --------------------------------------------------------*/
139 136
140#ifdef __bfin__ 137#ifdef __bfin__
141static inline int32_t dot_asm(short *x, short *y, int len) 138static inline int32_t dot_asm(short *x, short *y, int len)
@@ -165,7 +162,6 @@ static inline int32_t dot_asm(short *x, short *y, int len)
165 return dot; 162 return dot;
166} 163}
167#endif 164#endif
168/*- End of function --------------------------------------------------------*/
169 165
170static __inline__ int16_t fir16(fir16_state_t *fir, int16_t sample) 166static __inline__ int16_t fir16(fir16_state_t *fir, int16_t sample)
171{ 167{
@@ -260,7 +256,6 @@ static __inline__ int16_t fir16(fir16_state_t *fir, int16_t sample)
260 fir->curr_pos--; 256 fir->curr_pos--;
261 return (int16_t) (y >> 15); 257 return (int16_t) (y >> 15);
262} 258}
263/*- End of function --------------------------------------------------------*/
264 259
265static __inline__ const int16_t *fir32_create(fir32_state_t *fir, 260static __inline__ const int16_t *fir32_create(fir32_state_t *fir,
266 const int32_t *coeffs, 261 const int32_t *coeffs,
@@ -272,19 +267,16 @@ static __inline__ const int16_t *fir32_create(fir32_state_t *fir,
272 fir->history = kcalloc(taps, sizeof(int16_t), GFP_KERNEL); 267 fir->history = kcalloc(taps, sizeof(int16_t), GFP_KERNEL);
273 return fir->history; 268 return fir->history;
274} 269}
275/*- End of function --------------------------------------------------------*/
276 270
277static __inline__ void fir32_flush(fir32_state_t *fir) 271static __inline__ void fir32_flush(fir32_state_t *fir)
278{ 272{
279 memset(fir->history, 0, fir->taps*sizeof(int16_t)); 273 memset(fir->history, 0, fir->taps*sizeof(int16_t));
280} 274}
281/*- End of function --------------------------------------------------------*/
282 275
283static __inline__ void fir32_free(fir32_state_t *fir) 276static __inline__ void fir32_free(fir32_state_t *fir)
284{ 277{
285 kfree(fir->history); 278 kfree(fir->history);
286} 279}
287/*- End of function --------------------------------------------------------*/
288 280
289static __inline__ int16_t fir32(fir32_state_t *fir, int16_t sample) 281static __inline__ int16_t fir32(fir32_state_t *fir, int16_t sample)
290{ 282{
@@ -306,7 +298,6 @@ static __inline__ int16_t fir32(fir32_state_t *fir, int16_t sample)
306 fir->curr_pos--; 298 fir->curr_pos--;
307 return (int16_t) (y >> 15); 299 return (int16_t) (y >> 15);
308} 300}
309/*- End of function --------------------------------------------------------*/
310 301
311#endif 302#endif
312/*- End of file ------------------------------------------------------------*/ 303/*- End of file ------------------------------------------------------------*/