projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
[firefly-linux-kernel-4.4.55.git]
/
sound
/
oss
/
pas2_mixer.c
diff --git
a/sound/oss/pas2_mixer.c
b/sound/oss/pas2_mixer.c
index a0bcb85c39046a8c4878b6367e6bd2cc938e2140..50b5bd5012479a8cf43e0a905649fefaf7562f23 100644
(file)
--- a/
sound/oss/pas2_mixer.c
+++ b/
sound/oss/pas2_mixer.c
@@
-21,10
+21,6
@@
#include "pas2.h"
#include "pas2.h"
-#ifndef DEB
-#define DEB(what) /* (what) */
-#endif
-
extern int pas_translate_code;
extern char pas_model;
extern int *pas_osp;
extern int pas_translate_code;
extern char pas_model;
extern int *pas_osp;
@@
-120,8
+116,6
@@
pas_mixer_set(int whichDev, unsigned int level)
{
int left, right, devmask, changed, i, mixer = 0;
{
int left, right, devmask, changed, i, mixer = 0;
- DEB(printk("static int pas_mixer_set(int whichDev = %d, unsigned int level = %X)\n", whichDev, level));
-
left = level & 0x7f;
right = (level & 0x7f00) >> 8;
left = level & 0x7f;
right = (level & 0x7f00) >> 8;
@@
-207,8
+201,6
@@
pas_mixer_reset(void)
{
int foo;
{
int foo;
- DEB(printk("pas2_mixer.c: void pas_mixer_reset(void)\n"));
-
for (foo = 0; foo < SOUND_MIXER_NRDEVICES; foo++)
pas_mixer_set(foo, levels[foo]);
for (foo = 0; foo < SOUND_MIXER_NRDEVICES; foo++)
pas_mixer_set(foo, levels[foo]);
@@
-220,7
+212,6
@@
static int pas_mixer_ioctl(int dev, unsigned int cmd, void __user *arg)
int level,v ;
int __user *p = (int __user *)arg;
int level,v ;
int __user *p = (int __user *)arg;
- DEB(printk("pas2_mixer.c: int pas_mixer_ioctl(unsigned int cmd = %X, unsigned int arg = %X)\n", cmd, arg));
if (cmd == SOUND_MIXER_PRIVATE1) { /* Set loudness bit */
if (get_user(level, p))
return -EFAULT;
if (cmd == SOUND_MIXER_PRIVATE1) { /* Set loudness bit */
if (get_user(level, p))
return -EFAULT;