]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ALSA: dice: enclose identifiers referred by single function
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Thu, 5 Jan 2017 12:48:10 +0000 (21:48 +0900)
committerTakashi Iwai <tiwai@suse.de>
Thu, 5 Jan 2017 15:58:06 +0000 (16:58 +0100)
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>
sound/firewire/dice/dice-midi.c

index a040617505a75df7024508deb1a2909ee9a9e8e9..cdf71c211342e2b7dfcded34cd0b51a11b942927 100644 (file)
@@ -78,18 +78,6 @@ static void midi_playback_trigger(struct snd_rawmidi_substream *substrm, int up)
        spin_unlock_irqrestore(&dice->lock, flags);
 }
 
-static struct snd_rawmidi_ops capture_ops = {
-       .open           = midi_open,
-       .close          = midi_close,
-       .trigger        = midi_capture_trigger,
-};
-
-static struct snd_rawmidi_ops playback_ops = {
-       .open           = midi_open,
-       .close          = midi_close,
-       .trigger        = midi_playback_trigger,
-};
-
 static void set_midi_substream_names(struct snd_dice *dice,
                                     struct snd_rawmidi_str *str)
 {
@@ -103,6 +91,16 @@ static void set_midi_substream_names(struct snd_dice *dice,
 
 int snd_dice_create_midi(struct snd_dice *dice)
 {
+       static struct snd_rawmidi_ops capture_ops = {
+               .open           = midi_open,
+               .close          = midi_close,
+               .trigger        = midi_capture_trigger,
+       };
+       static struct snd_rawmidi_ops playback_ops = {
+               .open           = midi_open,
+               .close          = midi_close,
+               .trigger        = midi_playback_trigger,
+       };
        __be32 reg;
        struct snd_rawmidi *rmidi;
        struct snd_rawmidi_str *str;