git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
sound
/
core
/
sound_oss.c
diff --git
a/sound/core/sound_oss.c
b/sound/core/sound_oss.c
index
9055c6d
..
7975220
100644
(file)
--- a/
sound/core/sound_oss.c
+++ b/
sound/core/sound_oss.c
@@
-34,12
+34,11
@@
#include <sound/minors.h>
#include <sound/info.h>
#include <linux/sound.h>
#include <sound/minors.h>
#include <sound/info.h>
#include <linux/sound.h>
-#include <linux/mutex.h>
#define SNDRV_OSS_MINORS 128
static struct snd_minor *snd_oss_minors[SNDRV_OSS_MINORS];
#define SNDRV_OSS_MINORS 128
static struct snd_minor *snd_oss_minors[SNDRV_OSS_MINORS];
-static DE
FIN
E_MUTEX(sound_oss_mutex);
+static DE
CLAR
E_MUTEX(sound_oss_mutex);
void *snd_lookup_oss_minor_data(unsigned int minor, int type)
{
void *snd_lookup_oss_minor_data(unsigned int minor, int type)
{
@@
-48,13
+47,13
@@
void *snd_lookup_oss_minor_data(unsigned int minor, int type)
if (minor >= ARRAY_SIZE(snd_oss_minors))
return NULL;
if (minor >= ARRAY_SIZE(snd_oss_minors))
return NULL;
-
mutex_lock
(&sound_oss_mutex);
+
down
(&sound_oss_mutex);
mreg = snd_oss_minors[minor];
if (mreg && mreg->type == type)
private_data = mreg->private_data;
else
private_data = NULL;
mreg = snd_oss_minors[minor];
if (mreg && mreg->type == type)
private_data = mreg->private_data;
else
private_data = NULL;
-
mutex_unlock
(&sound_oss_mutex);
+
up
(&sound_oss_mutex);
return private_data;
}
return private_data;
}
@@
-95,7
+94,7
@@
static int snd_oss_kernel_minor(int type, struct snd_card *card, int dev)
}
int snd_register_oss_device(int type, struct snd_card *card, int dev,
}
int snd_register_oss_device(int type, struct snd_card *card, int dev,
-
const
struct file_operations *f_ops, void *private_data,
+ struct file_operations *f_ops, void *private_data,
const char *name)
{
int minor = snd_oss_kernel_minor(type, card, dev);
const char *name)
{
int minor = snd_oss_kernel_minor(type, card, dev);
@@
-118,7
+117,7
@@
int snd_register_oss_device(int type, struct snd_card *card, int dev,
preg->device = dev;
preg->f_ops = f_ops;
preg->private_data = private_data;
preg->device = dev;
preg->f_ops = f_ops;
preg->private_data = private_data;
-
mutex_lock
(&sound_oss_mutex);
+
down
(&sound_oss_mutex);
snd_oss_minors[minor] = preg;
minor_unit = SNDRV_MINOR_OSS_DEVICE(minor);
switch (minor_unit) {
snd_oss_minors[minor] = preg;
minor_unit = SNDRV_MINOR_OSS_DEVICE(minor);
switch (minor_unit) {
@@
-144,7
+143,7
@@
int snd_register_oss_device(int type, struct snd_card *card, int dev,
goto __end;
snd_oss_minors[track2] = preg;
}
goto __end;
snd_oss_minors[track2] = preg;
}
-
mutex_unlock
(&sound_oss_mutex);
+
up
(&sound_oss_mutex);
return 0;
__end:
return 0;
__end:
@@
-153,7
+152,7
@@
int snd_register_oss_device(int type, struct snd_card *card, int dev,
if (register1 >= 0)
unregister_sound_special(register1);
snd_oss_minors[minor] = NULL;
if (register1 >= 0)
unregister_sound_special(register1);
snd_oss_minors[minor] = NULL;
-
mutex_unlock
(&sound_oss_mutex);
+
up
(&sound_oss_mutex);
kfree(preg);
return -EBUSY;
}
kfree(preg);
return -EBUSY;
}
@@
-169,10
+168,10
@@
int snd_unregister_oss_device(int type, struct snd_card *card, int dev)
return 0;
if (minor < 0)
return minor;
return 0;
if (minor < 0)
return minor;
-
mutex_lock
(&sound_oss_mutex);
+
down
(&sound_oss_mutex);
mptr = snd_oss_minors[minor];
if (mptr == NULL) {
mptr = snd_oss_minors[minor];
if (mptr == NULL) {
-
mutex_unlock
(&sound_oss_mutex);
+
up
(&sound_oss_mutex);
return -ENOENT;
}
unregister_sound_special(minor);
return -ENOENT;
}
unregister_sound_special(minor);
@@
-192,7
+191,7
@@
int snd_unregister_oss_device(int type, struct snd_card *card, int dev)
snd_oss_minors[track2] = NULL;
}
snd_oss_minors[minor] = NULL;
snd_oss_minors[track2] = NULL;
}
snd_oss_minors[minor] = NULL;
-
mutex_unlock
(&sound_oss_mutex);
+
up
(&sound_oss_mutex);
kfree(mptr);
return 0;
}
kfree(mptr);
return 0;
}
@@
-230,7
+229,7
@@
static void snd_minor_info_oss_read(struct snd_info_entry *entry,
int minor;
struct snd_minor *mptr;
int minor;
struct snd_minor *mptr;
-
mutex_lock
(&sound_oss_mutex);
+
down
(&sound_oss_mutex);
for (minor = 0; minor < SNDRV_OSS_MINORS; ++minor) {
if (!(mptr = snd_oss_minors[minor]))
continue;
for (minor = 0; minor < SNDRV_OSS_MINORS; ++minor) {
if (!(mptr = snd_oss_minors[minor]))
continue;
@@
-242,7
+241,7
@@
static void snd_minor_info_oss_read(struct snd_info_entry *entry,
snd_iprintf(buffer, "%3i: : %s\n", minor,
snd_oss_device_type_name(mptr->type));
}
snd_iprintf(buffer, "%3i: : %s\n", minor,
snd_oss_device_type_name(mptr->type));
}
-
mutex_unlock
(&sound_oss_mutex);
+
up
(&sound_oss_mutex);
}
}