diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-02-22 06:52:53 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-11 10:55:42 -0400 |
commit | ef991b95aa1351a5782cfaccb9aefba76ca8b990 (patch) | |
tree | 129762745099142652615dbe1c4c29725cca51c8 /sound/isa | |
parent | 5e24c1c1c496c4603395d6e9cc320f85008fc891 (diff) |
[ALSA] Add snd_pcm_group_for_each_entry() for code cleanup
Added a new macro snd_pcm_group_for_each_entry() just for code cleanup.
Old macros, snd_pcm_group_for_each() and snd_pcm_group_substream_entry(),
are removed.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/isa')
-rw-r--r-- | sound/isa/cs423x/cs4231_lib.c | 4 | ||||
-rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sound/isa/cs423x/cs4231_lib.c b/sound/isa/cs423x/cs4231_lib.c index 75c7c5f01989..914d77b61b0c 100644 --- a/sound/isa/cs423x/cs4231_lib.c +++ b/sound/isa/cs423x/cs4231_lib.c | |||
@@ -405,7 +405,6 @@ static int snd_cs4231_trigger(struct snd_pcm_substream *substream, | |||
405 | struct snd_cs4231 *chip = snd_pcm_substream_chip(substream); | 405 | struct snd_cs4231 *chip = snd_pcm_substream_chip(substream); |
406 | int result = 0; | 406 | int result = 0; |
407 | unsigned int what; | 407 | unsigned int what; |
408 | struct list_head *pos; | ||
409 | struct snd_pcm_substream *s; | 408 | struct snd_pcm_substream *s; |
410 | int do_start; | 409 | int do_start; |
411 | 410 | ||
@@ -425,8 +424,7 @@ static int snd_cs4231_trigger(struct snd_pcm_substream *substream, | |||
425 | } | 424 | } |
426 | 425 | ||
427 | what = 0; | 426 | what = 0; |
428 | snd_pcm_group_for_each(pos, substream) { | 427 | snd_pcm_group_for_each_entry(s, substream) { |
429 | s = snd_pcm_group_substream_entry(pos); | ||
430 | if (s == chip->playback_substream) { | 428 | if (s == chip->playback_substream) { |
431 | what |= CS4231_PLAYBACK_ENABLE; | 429 | what |= CS4231_PLAYBACK_ENABLE; |
432 | snd_pcm_trigger_done(s, substream); | 430 | snd_pcm_trigger_done(s, substream); |
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index 1c390580bd50..95d0ab124d5b 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c | |||
@@ -934,10 +934,8 @@ static int snd_opti93x_trigger(struct snd_pcm_substream *substream, | |||
934 | case SNDRV_PCM_TRIGGER_STOP: | 934 | case SNDRV_PCM_TRIGGER_STOP: |
935 | { | 935 | { |
936 | unsigned int what = 0; | 936 | unsigned int what = 0; |
937 | struct list_head *pos; | ||
938 | struct snd_pcm_substream *s; | 937 | struct snd_pcm_substream *s; |
939 | snd_pcm_group_for_each(pos, substream) { | 938 | snd_pcm_group_for_each_entry(s, substream) { |
940 | s = snd_pcm_group_substream_entry(pos); | ||
941 | if (s == chip->playback_substream) { | 939 | if (s == chip->playback_substream) { |
942 | what |= OPTi93X_PLAYBACK_ENABLE; | 940 | what |= OPTi93X_PLAYBACK_ENABLE; |
943 | snd_pcm_trigger_done(s, substream); | 941 | snd_pcm_trigger_done(s, substream); |