aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/easycap/easycap_sound.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2011-02-03 06:42:47 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-04 15:44:33 -0500
commit055e3a3a2cdcb7d39d14857e2fb2175c11168ee7 (patch)
treecebf7befb37bfd7ab7ca2ae1acaa828db26fd5d1 /drivers/staging/easycap/easycap_sound.c
parent1a4cb0fb7da009643368b3577b65a2d1da5485dd (diff)
staging/easycap: replace underscored types with regular once
the underscored types should be used in user space headers only Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/easycap/easycap_sound.c')
-rw-r--r--drivers/staging/easycap/easycap_sound.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/easycap/easycap_sound.c b/drivers/staging/easycap/easycap_sound.c
index e0fc188ae38..626450a5714 100644
--- a/drivers/staging/easycap/easycap_sound.c
+++ b/drivers/staging/easycap/easycap_sound.c
@@ -72,12 +72,12 @@ struct snd_pcm_substream *pss;
72struct snd_pcm_runtime *prt; 72struct snd_pcm_runtime *prt;
73int dma_bytes, fragment_bytes; 73int dma_bytes, fragment_bytes;
74int isfragment; 74int isfragment;
75__u8 *p1, *p2; 75u8 *p1, *p2;
76__s16 tmp; 76s16 tmp;
77int i, j, more, much, rc; 77int i, j, more, much, rc;
78#ifdef UPSAMPLE 78#ifdef UPSAMPLE
79int k; 79int k;
80__s16 oldaudio, newaudio, delta; 80s16 oldaudio, newaudio, delta;
81#endif /*UPSAMPLE*/ 81#endif /*UPSAMPLE*/
82 82
83JOT(16, "\n"); 83JOT(16, "\n");
@@ -152,7 +152,7 @@ for (i = 0; i < purb->number_of_packets; i++) {
152 peasycap->audio_mt = 0; 152 peasycap->audio_mt = 0;
153 } 153 }
154 154
155 p1 = (__u8 *)(purb->transfer_buffer + 155 p1 = (u8 *)(purb->transfer_buffer +
156 purb->iso_frame_desc[i].offset); 156 purb->iso_frame_desc[i].offset);
157 157
158/*---------------------------------------------------------------------------*/ 158/*---------------------------------------------------------------------------*/
@@ -193,7 +193,7 @@ for (i = 0; i < purb->number_of_packets; i++) {
193 more)) 193 more))
194 much = 16 * 194 much = 16 *
195 more; 195 more;
196 p2 = (__u8 *)(prt->dma_area + 196 p2 = (u8 *)(prt->dma_area +
197 peasycap->dma_fill); 197 peasycap->dma_fill);
198 198
199 for (j = 0; j < (much/16); j++) { 199 for (j = 0; j < (much/16); j++) {
@@ -223,7 +223,7 @@ for (i = 0; i < purb->number_of_packets; i++) {
223#else /*!UPSAMPLE*/ 223#else /*!UPSAMPLE*/
224 if (much > (2 * more)) 224 if (much > (2 * more))
225 much = 2 * more; 225 much = 2 * more;
226 p2 = (__u8 *)(prt->dma_area + 226 p2 = (u8 *)(prt->dma_area +
227 peasycap->dma_fill); 227 peasycap->dma_fill);
228 228
229 for (j = 0; j < (much / 2); j++) { 229 for (j = 0; j < (much / 2); j++) {