Skip to content

Commit e8d04a9

Browse files
Dr. David Alan Gilberttiwai
authored andcommitted
ALSA: lola: Remove unused lola_(save|restore)_mixer
lola_restore_mixer() and lola_save_mixer() were added in 2011 by commit d43f301 ("ALSA: Add the driver for Digigram Lola PCI-e boards") but have remain unused. Remove them. Signed-off-by: Dr. David Alan Gilbert <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent 76b0a22 commit e8d04a9

File tree

2 files changed

+0
-45
lines changed

2 files changed

+0
-45
lines changed

sound/pci/lola/lola.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,8 +499,6 @@ int lola_init_mixer_widget(struct lola *chip, int nid);
499499
void lola_free_mixer(struct lola *chip);
500500
int lola_create_mixer(struct lola *chip);
501501
int lola_setup_all_analog_gains(struct lola *chip, int dir, bool mute);
502-
void lola_save_mixer(struct lola *chip);
503-
void lola_restore_mixer(struct lola *chip);
504502
int lola_set_src_config(struct lola *chip, unsigned int src_mask, bool update);
505503

506504
/* proc */

sound/pci/lola/lola_mixer.c

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -336,49 +336,6 @@ int lola_setup_all_analog_gains(struct lola *chip, int dir, bool mute)
336336
return lola_codec_flush(chip);
337337
}
338338

339-
void lola_save_mixer(struct lola *chip)
340-
{
341-
/* mute analog output */
342-
if (chip->mixer.array_saved) {
343-
/* store contents of mixer array */
344-
memcpy_fromio(chip->mixer.array_saved, chip->mixer.array,
345-
sizeof(*chip->mixer.array));
346-
}
347-
lola_setup_all_analog_gains(chip, PLAY, true); /* output mute */
348-
}
349-
350-
void lola_restore_mixer(struct lola *chip)
351-
{
352-
int i;
353-
354-
/*lola_reset_setups(chip);*/
355-
if (chip->mixer.array_saved) {
356-
/* restore contents of mixer array */
357-
memcpy_toio(chip->mixer.array, chip->mixer.array_saved,
358-
sizeof(*chip->mixer.array));
359-
/* inform micro-controller about all restored values
360-
* and ignore return values
361-
*/
362-
for (i = 0; i < chip->mixer.src_phys_ins; i++)
363-
lola_codec_write(chip, chip->mixer.nid,
364-
LOLA_VERB_SET_SOURCE_GAIN,
365-
i, 0);
366-
for (i = 0; i < chip->mixer.src_stream_outs; i++)
367-
lola_codec_write(chip, chip->mixer.nid,
368-
LOLA_VERB_SET_SOURCE_GAIN,
369-
chip->mixer.src_stream_out_ofs + i, 0);
370-
for (i = 0; i < chip->mixer.dest_stream_ins; i++)
371-
lola_codec_write(chip, chip->mixer.nid,
372-
LOLA_VERB_SET_DESTINATION_GAIN,
373-
i, 0);
374-
for (i = 0; i < chip->mixer.dest_phys_outs; i++)
375-
lola_codec_write(chip, chip->mixer.nid,
376-
LOLA_VERB_SET_DESTINATION_GAIN,
377-
chip->mixer.dest_phys_out_ofs + i, 0);
378-
lola_codec_flush(chip);
379-
}
380-
}
381-
382339
/*
383340
*/
384341

0 commit comments

Comments
 (0)