mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
ALSA: fireworks: code refactoring for rawmidi.open/close
Two sets of callbacks for rawmidi.open/close but they have the same codes. This commit unifies each of the callbacks. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
1dc5921082
commit
add147ad55
1 changed files with 6 additions and 39 deletions
|
@ -8,27 +8,7 @@
|
|||
*/
|
||||
#include "fireworks.h"
|
||||
|
||||
static int midi_capture_open(struct snd_rawmidi_substream *substream)
|
||||
{
|
||||
struct snd_efw *efw = substream->rmidi->private_data;
|
||||
int err;
|
||||
|
||||
err = snd_efw_stream_lock_try(efw);
|
||||
if (err < 0)
|
||||
goto end;
|
||||
|
||||
mutex_lock(&efw->mutex);
|
||||
++efw->substreams_counter;
|
||||
err = snd_efw_stream_start_duplex(efw, 0);
|
||||
mutex_unlock(&efw->mutex);
|
||||
if (err < 0)
|
||||
snd_efw_stream_lock_release(efw);
|
||||
|
||||
end:
|
||||
return err;
|
||||
}
|
||||
|
||||
static int midi_playback_open(struct snd_rawmidi_substream *substream)
|
||||
static int midi_open(struct snd_rawmidi_substream *substream)
|
||||
{
|
||||
struct snd_efw *efw = substream->rmidi->private_data;
|
||||
int err;
|
||||
|
@ -47,20 +27,7 @@ static int midi_playback_open(struct snd_rawmidi_substream *substream)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int midi_capture_close(struct snd_rawmidi_substream *substream)
|
||||
{
|
||||
struct snd_efw *efw = substream->rmidi->private_data;
|
||||
|
||||
mutex_lock(&efw->mutex);
|
||||
--efw->substreams_counter;
|
||||
snd_efw_stream_stop_duplex(efw);
|
||||
mutex_unlock(&efw->mutex);
|
||||
|
||||
snd_efw_stream_lock_release(efw);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int midi_playback_close(struct snd_rawmidi_substream *substream)
|
||||
static int midi_close(struct snd_rawmidi_substream *substream)
|
||||
{
|
||||
struct snd_efw *efw = substream->rmidi->private_data;
|
||||
|
||||
|
@ -121,13 +88,13 @@ static void set_midi_substream_names(struct snd_efw *efw,
|
|||
int snd_efw_create_midi_devices(struct snd_efw *efw)
|
||||
{
|
||||
static const struct snd_rawmidi_ops capture_ops = {
|
||||
.open = midi_capture_open,
|
||||
.close = midi_capture_close,
|
||||
.open = midi_open,
|
||||
.close = midi_close,
|
||||
.trigger = midi_capture_trigger,
|
||||
};
|
||||
static const struct snd_rawmidi_ops playback_ops = {
|
||||
.open = midi_playback_open,
|
||||
.close = midi_playback_close,
|
||||
.open = midi_open,
|
||||
.close = midi_close,
|
||||
.trigger = midi_playback_trigger,
|
||||
};
|
||||
struct snd_rawmidi *rmidi;
|
||||
|
|
Loading…
Reference in a new issue