ALSA: oxfw: enclose identifiers referred by single function

Some identifiers are referred just by one functions. In this case, they
can be put into the function definition. This brings two merits; readers
can easily follow codes related to the identifiers, developers are free
from name conflict.

This commit moves such identifiers to each function definition.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/oxfw/oxfw-midi.c b/sound/firewire/oxfw/oxfw-midi.c
index 8665e1043d41fa380a8a94f213098cbca29d87ef..076a1a977275939220cdc691db78778e4af4ad11 100644 (file)
--- a/sound/firewire/oxfw/oxfw-midi.c
+++ b/sound/firewire/oxfw/oxfw-midi.c
@@ -116,18 +116,6 @@ static void midi_playback_trigger(struct snd_rawmidi_substream *substrm, int up)
        spin_unlock_irqrestore(&oxfw->lock, flags);
 }
 
-static struct snd_rawmidi_ops midi_capture_ops = {
-       .open           = midi_capture_open,
-       .close          = midi_capture_close,
-       .trigger        = midi_capture_trigger,
-};
-
-static struct snd_rawmidi_ops midi_playback_ops = {
-       .open           = midi_playback_open,
-       .close          = midi_playback_close,
-       .trigger        = midi_playback_trigger,
-};
-
 static void set_midi_substream_names(struct snd_oxfw *oxfw,
                                     struct snd_rawmidi_str *str)
 {
@@ -142,6 +130,16 @@ static void set_midi_substream_names(struct snd_oxfw *oxfw,
 
 int snd_oxfw_create_midi(struct snd_oxfw *oxfw)
 {
+       static struct snd_rawmidi_ops capture_ops = {
+               .open           = midi_capture_open,
+               .close          = midi_capture_close,
+               .trigger        = midi_capture_trigger,
+       };
+       static struct snd_rawmidi_ops playback_ops = {
+               .open           = midi_playback_open,
+               .close          = midi_playback_close,
+               .trigger        = midi_playback_trigger,
+       };
        struct snd_rawmidi *rmidi;
        struct snd_rawmidi_str *str;
        int err;
@@ -164,7 +162,7 @@ int snd_oxfw_create_midi(struct snd_oxfw *oxfw)
                rmidi->info_flags |= SNDRV_RAWMIDI_INFO_INPUT;
 
                snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,
-                                   &midi_capture_ops);
+                                   &capture_ops);
 
                str = &rmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT];
 
@@ -175,7 +173,7 @@ int snd_oxfw_create_midi(struct snd_oxfw *oxfw)
                rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT;
 
                snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,
-                                   &midi_playback_ops);
+                                   &playback_ops);
 
                str = &rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT];