redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[ALSA] ESS Maestro 1/2/2E Sound Card: Use list_for_each_entry

Browse source 
ESS Maestro 1/2/2E Sound Card: Use list_for_each_entry instead of
list_for_each

Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Matthias Kaehlcke 2007-09-17 14:39:05 +02:00 committed by Jaroslav Kysela
parent f79415207e
commit 50f47ff1b9
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sound/pci/es1968.c
View file

@ -843,10 +843,9 @@ static void snd_es1968_bob_dec(struct es1968 *chip)
snd_es1968_bob_stop(chip); snd_es1968_bob_stop(chip);
else if (chip->bob_freq > ESM_BOB_FREQ) { else if (chip->bob_freq > ESM_BOB_FREQ) {
/* check reduction of timer frequency */ /* check reduction of timer frequency */
struct list_head *p;
int max_freq = ESM_BOB_FREQ; int max_freq = ESM_BOB_FREQ;
list_for_each(p, &chip->substream_list) { struct esschan *es;
struct esschan *es = list_entry(p, struct esschan, list); list_for_each_entry(es, &chip->substream_list, list) {
if (max_freq < es->bob_freq) if (max_freq < es->bob_freq)
max_freq = es->bob_freq; max_freq = es->bob_freq;
} }
@ -1316,12 +1315,11 @@ static struct snd_pcm_hardware snd_es1968_capture = {
static int calc_available_memory_size(struct es1968 *chip) static int calc_available_memory_size(struct es1968 *chip)
{ {
struct list_head *p;
int max_size = 0; int max_size = 0;
struct esm_memory *buf;
mutex_lock(&chip->memory_mutex); mutex_lock(&chip->memory_mutex);
list_for_each(p, &chip->buf_list) { list_for_each_entry(buf, &chip->buf_list, list) {
struct esm_memory *buf = list_entry(p, struct esm_memory, list);
if (buf->empty && buf->buf.bytes > max_size) if (buf->empty && buf->buf.bytes > max_size)
max_size = buf->buf.bytes; max_size = buf->buf.bytes;
} }
@ -1335,12 +1333,10 @@ static int calc_available_memory_size(struct es1968 *chip)
static struct esm_memory *snd_es1968_new_memory(struct es1968 *chip, int size) static struct esm_memory *snd_es1968_new_memory(struct es1968 *chip, int size)
{ {
struct esm_memory *buf; struct esm_memory *buf;
struct list_head *p;
size = ALIGN(size, ESM_MEM_ALIGN); size = ALIGN(size, ESM_MEM_ALIGN);
mutex_lock(&chip->memory_mutex); mutex_lock(&chip->memory_mutex);
list_for_each(p, &chip->buf_list) { list_for_each_entry(buf, &chip->buf_list, list) {
buf = list_entry(p, struct esm_memory, list);
if (buf->empty && buf->buf.bytes >= size) if (buf->empty && buf->buf.bytes >= size)
goto __found; goto __found;
} }
@ -1938,10 +1934,9 @@ static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id)
} }
if (event & ESM_SOUND_IRQ) { if (event & ESM_SOUND_IRQ) {
struct list_head *p; struct esschan *es;
spin_lock(&chip->substream_lock); spin_lock(&chip->substream_lock);
list_for_each(p, &chip->substream_list) { list_for_each_entry(es, &chip->substream_list, list) {
struct esschan *es = list_entry(p, struct esschan, list);
if (es->running) if (es->running)
snd_es1968_update_pcm(chip, es); snd_es1968_update_pcm(chip, es);
} }
@ -2345,7 +2340,7 @@ static int es1968_resume(struct pci_dev *pci)
{ {
struct snd_card *card = pci_get_drvdata(pci); struct snd_card *card = pci_get_drvdata(pci);
struct es1968 *chip = card->private_data; struct es1968 *chip = card->private_data;
struct list_head *p; struct esschan *es;
if (! chip->do_pm) if (! chip->do_pm)
return 0; return 0;
@ -2374,8 +2369,7 @@ static int es1968_resume(struct pci_dev *pci)
/* restore ac97 state */ /* restore ac97 state */
snd_ac97_resume(chip->ac97); snd_ac97_resume(chip->ac97);
list_for_each(p, &chip->substream_list) { list_for_each_entry(es, &chip->substream_list, list) {
struct esschan *es = list_entry(p, struct esschan, list);
switch (es->mode) { switch (es->mode) {
case ESM_MODE_PLAY: case ESM_MODE_PLAY:
snd_es1968_playback_setup(chip, es, es->substream->runtime); snd_es1968_playback_setup(chip, es, es->substream->runtime);