#include <linux/slab.h>
#include <linux/time.h>
#include <linux/wait.h>
-#include <linux/mutex.h>
#include <linux/moduleparam.h>
#include <linux/delay.h>
#include <linux/wait.h>
static int snd_rawmidi_dev_unregister(struct snd_device *device);
static LIST_HEAD(snd_rawmidi_devices);
-static DEFINE_MUTEX(register_mutex);
+static DECLARE_MUTEX(register_mutex);
static struct snd_rawmidi *snd_rawmidi_search(struct snd_card *card, int device)
{
if (rfile)
rfile->input = rfile->output = NULL;
- mutex_lock(®ister_mutex);
+ down(®ister_mutex);
rmidi = snd_rawmidi_search(card, device);
- mutex_unlock(®ister_mutex);
+ up(®ister_mutex);
if (rmidi == NULL) {
err = -ENODEV;
goto __error1;
goto __error1;
}
if (!(mode & SNDRV_RAWMIDI_LFLG_NOOPENLOCK))
- mutex_lock(&rmidi->open_mutex);
+ down(&rmidi->open_mutex);
if (mode & SNDRV_RAWMIDI_LFLG_INPUT) {
if (!(rmidi->info_flags & SNDRV_RAWMIDI_INFO_INPUT)) {
err = -ENXIO;
soutput = NULL;
}
if (!(mode & SNDRV_RAWMIDI_LFLG_NOOPENLOCK))
- mutex_unlock(&rmidi->open_mutex);
+ up(&rmidi->open_mutex);
if (rfile) {
rfile->rmidi = rmidi;
rfile->input = sinput;
snd_rawmidi_runtime_free(soutput);
module_put(rmidi->card->module);
if (!(mode & SNDRV_RAWMIDI_LFLG_NOOPENLOCK))
- mutex_unlock(&rmidi->open_mutex);
+ up(&rmidi->open_mutex);
__error1:
return err;
}
}
init_waitqueue_entry(&wait, current);
add_wait_queue(&rmidi->open_wait, &wait);
- mutex_lock(&rmidi->open_mutex);
+ down(&rmidi->open_mutex);
while (1) {
subdevice = -1;
down_read(&card->controls_rwsem);
} else
break;
set_current_state(TASK_INTERRUPTIBLE);
- mutex_unlock(&rmidi->open_mutex);
+ up(&rmidi->open_mutex);
schedule();
- mutex_lock(&rmidi->open_mutex);
+ down(&rmidi->open_mutex);
if (signal_pending(current)) {
err = -ERESTARTSYS;
break;
snd_card_file_remove(card, file);
kfree(rawmidi_file);
}
- mutex_unlock(&rmidi->open_mutex);
+ up(&rmidi->open_mutex);
return err;
}
snd_assert(rfile != NULL, return -ENXIO);
snd_assert(rfile->input != NULL || rfile->output != NULL, return -ENXIO);
rmidi = rfile->rmidi;
- mutex_lock(&rmidi->open_mutex);
+ down(&rmidi->open_mutex);
if (rfile->input != NULL) {
substream = rfile->input;
rfile->input = NULL;
}
rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substream_opened--;
}
- mutex_unlock(&rmidi->open_mutex);
+ up(&rmidi->open_mutex);
module_put(rmidi->card->module);
return 0;
}
struct snd_rawmidi_substream *substream;
struct list_head *list;
- mutex_lock(®ister_mutex);
+ down(®ister_mutex);
rmidi = snd_rawmidi_search(card, info->device);
- mutex_unlock(®ister_mutex);
+ up(®ister_mutex);
if (!rmidi)
return -ENXIO;
if (info->stream < 0 || info->stream > 1)
return -EINVAL;
}
if (params->buffer_size != runtime->buffer_size) {
- newbuf = kmalloc(params->buffer_size, GFP_KERNEL);
- if (!newbuf)
+ if ((newbuf = (char *) kmalloc(params->buffer_size, GFP_KERNEL)) == NULL)
return -ENOMEM;
kfree(runtime->buffer);
runtime->buffer = newbuf;
return -EINVAL;
}
if (params->buffer_size != runtime->buffer_size) {
- newbuf = kmalloc(params->buffer_size, GFP_KERNEL);
- if (!newbuf)
+ if ((newbuf = (char *) kmalloc(params->buffer_size, GFP_KERNEL)) == NULL)
return -ENOMEM;
kfree(runtime->buffer);
runtime->buffer = newbuf;
if (get_user(device, (int __user *)argp))
return -EFAULT;
- mutex_lock(®ister_mutex);
+ down(®ister_mutex);
device = device < 0 ? 0 : device + 1;
while (device < SNDRV_RAWMIDI_DEVICES) {
if (snd_rawmidi_search(card, device))
}
if (device == SNDRV_RAWMIDI_DEVICES)
device = -1;
- mutex_unlock(®ister_mutex);
+ up(®ister_mutex);
if (put_user(device, (int __user *)argp))
return -EFAULT;
return 0;
rmidi = entry->private_data;
snd_iprintf(buffer, "%s\n\n", rmidi->name);
- mutex_lock(&rmidi->open_mutex);
+ down(&rmidi->open_mutex);
if (rmidi->info_flags & SNDRV_RAWMIDI_INFO_OUTPUT) {
list_for_each(list, &rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams) {
substream = list_entry(list, struct snd_rawmidi_substream, list);
}
}
}
- mutex_unlock(&rmidi->open_mutex);
+ up(&rmidi->open_mutex);
}
/*
}
rmidi->card = card;
rmidi->device = device;
- mutex_init(&rmidi->open_mutex);
+ init_MUTEX(&rmidi->open_mutex);
init_waitqueue_head(&rmidi->open_wait);
if (id != NULL)
strlcpy(rmidi->id, id, sizeof(rmidi->id));
if (rmidi->device >= SNDRV_RAWMIDI_DEVICES)
return -ENOMEM;
- mutex_lock(®ister_mutex);
+ down(®ister_mutex);
if (snd_rawmidi_search(rmidi->card, rmidi->device)) {
- mutex_unlock(®ister_mutex);
+ up(®ister_mutex);
return -EBUSY;
}
list_add_tail(&rmidi->list, &snd_rawmidi_devices);
&snd_rawmidi_f_ops, rmidi, name)) < 0) {
snd_printk(KERN_ERR "unable to register rawmidi device %i:%i\n", rmidi->card->number, rmidi->device);
list_del(&rmidi->list);
- mutex_unlock(®ister_mutex);
+ up(®ister_mutex);
return err;
}
if (rmidi->ops && rmidi->ops->dev_register &&
(err = rmidi->ops->dev_register(rmidi)) < 0) {
snd_unregister_device(SNDRV_DEVICE_TYPE_RAWMIDI, rmidi->card, rmidi->device);
list_del(&rmidi->list);
- mutex_unlock(®ister_mutex);
+ up(®ister_mutex);
return err;
}
#ifdef CONFIG_SND_OSSEMUL
}
}
#endif /* CONFIG_SND_OSSEMUL */
- mutex_unlock(®ister_mutex);
+ up(®ister_mutex);
sprintf(name, "midi%d", rmidi->device);
entry = snd_info_create_card_entry(rmidi->card, name, rmidi->card->proc_root);
if (entry) {
{
struct snd_rawmidi *rmidi = device->device_data;
- mutex_lock(®ister_mutex);
+ down(®ister_mutex);
list_del_init(&rmidi->list);
- mutex_unlock(®ister_mutex);
+ up(®ister_mutex);
return 0;
}
struct snd_rawmidi *rmidi = device->device_data;
snd_assert(rmidi != NULL, return -ENXIO);
- mutex_lock(®ister_mutex);
+ down(®ister_mutex);
list_del(&rmidi->list);
if (rmidi->proc_entry) {
snd_info_unregister(rmidi->proc_entry);
if (rmidi->ops && rmidi->ops->dev_unregister)
rmidi->ops->dev_unregister(rmidi);
snd_unregister_device(SNDRV_DEVICE_TYPE_RAWMIDI, rmidi->card, rmidi->device);
- mutex_unlock(®ister_mutex);
+ up(®ister_mutex);
#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
if (rmidi->seq_dev) {
snd_device_free(rmidi->card, rmidi->seq_dev);