naming variable s16 is confusing since it is also a type name.
Cc: Mike Thomas <rmthomas@xxxxxxxxxxx>
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
---
V2: rebase
drivers/staging/easycap/easycap_sound.c | 25 ++++++++++++-------------
drivers/staging/easycap/easycap_sound_oss.c | 26 +++++++++++++-------------
2 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/drivers/staging/easycap/easycap_sound.c b/drivers/staging/easycap/easycap_sound.c
index f5c4645..e0fc188 100644
--- a/drivers/staging/easycap/easycap_sound.c
+++ b/drivers/staging/easycap/easycap_sound.c
@@ -73,7 +73,7 @@ struct snd_pcm_runtime *prt;
int dma_bytes, fragment_bytes;
int isfragment;
__u8 *p1, *p2;
-__s16 s16;
+__s16 tmp;
int i, j, more, much, rc;
#ifdef UPSAMPLE
int k;
@@ -203,22 +203,22 @@ for (i = 0; i < purb->number_of_packets; i++) {
delta = (newaudio - oldaudio)
/ 4;
- s16 = oldaudio + delta;
+ tmp = oldaudio + delta;
for (k = 0; k < 4; k++) {
- *p2 = (0x00FF & s16);
+ *p2 = (0x00FF & tmp);
*(p2 + 1) = (0xFF00 &
- s16) >> 8;
+ tmp) >> 8;
p2 += 2;
- *p2 = (0x00FF & s16);
+ *p2 = (0x00FF & tmp);
*(p2 + 1) = (0xFF00 &
- s16) >> 8;
+ tmp) >> 8;
p2 += 2;
- s16 += delta;
+ tmp += delta;
}
p1++;
more--;
- oldaudio = s16;
+ oldaudio = tmp;
}
#else /*!UPSAMPLE*/
if (much > (2 * more))
@@ -227,11 +227,10 @@ for (i = 0; i < purb->number_of_packets; i++) {
peasycap->dma_fill);
for (j = 0; j < (much / 2); j++) {
- s16 = ((int) *p1) - 128;
- s16 = 128 *
- s16;
- *p2 = (0x00FF & s16);
- *(p2 + 1) = (0xFF00 & s16) >>
+ tmp = ((int) *p1) - 128;
+ tmp = 128 * tmp;
+ *p2 = (0x00FF & tmp);
+ *(p2 + 1) = (0xFF00 & tmp) >>
8;
p1++; p2 += 2;
more--;
diff --git a/drivers/staging/easycap/easycap_sound_oss.c b/drivers/staging/easycap/easycap_sound_oss.c
index 2fccb4c..639257c 100644
--- a/drivers/staging/easycap/easycap_sound_oss.c
+++ b/drivers/staging/easycap/easycap_sound_oss.c
@@ -54,7 +54,7 @@ easyoss_complete(struct urb *purb)
struct easycap *peasycap;
struct data_buffer *paudio_buffer;
__u8 *p1, *p2;
-__s16 s16;
+__s16 tmp;
int i, j, more, much, leap, rc;
#ifdef UPSAMPLE
int k;
@@ -235,23 +235,23 @@ for (i = 0; i < purb->number_of_packets; i++) {
delta = (newaudio - oldaudio)
/ 4;
- s16 = oldaudio + delta;
+ tmp = oldaudio + delta;
for (k = 0; k < 4; k++) {
- *p2 = (0x00FF & s16);
+ *p2 = (0x00FF & tmp);
*(p2 + 1) = (0xFF00 &
- s16) >> 8;
+ tmp) >> 8;
p2 += 2;
- *p2 = (0x00FF & s16);
+ *p2 = (0x00FF & tmp);
*(p2 + 1) = (0xFF00 &
- s16) >> 8;
+ tmp) >> 8;
p2 += 2;
- s16 += delta;
+ tmp += delta;
}
p1++;
more--;
- oldaudio = s16;
+ oldaudio = tmp;
}
#else /*!UPSAMPLE*/
if (much > (2 * more))
@@ -259,11 +259,11 @@ for (i = 0; i < purb->number_of_packets; i++) {
p2 = (__u8 *)paudio_buffer->pto;
for (j = 0; j < (much / 2); j++) {
- s16 = ((int) *p1) - 128;
- s16 = 128 *
- s16;
- *p2 = (0x00FF & s16);
- *(p2 + 1) = (0xFF00 & s16) >>
+ tmp = ((int) *p1) - 128;
+ tmp = 128 *
+ tmp;
+ *p2 = (0x00FF & tmp);
+ *(p2 + 1) = (0xFF00 & tmp) >>
8;
p1++; p2 += 2;
more--;
--
1.7.3.5
---------------------------------------------------------------------
Intel Israel (74) Limited
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
