ALSA: cs5535audio: clean up OLPC code
- add copyright info to _olpc.c - minor layout fixes - make Makefile more concise - silence a warning Signed-off-by: Andres Salomon <dilinger@debian.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
c8f0eeebc1
commit
b5ccc57b06
3 changed files with 13 additions and 8 deletions
|
@ -4,10 +4,7 @@
|
|||
|
||||
snd-cs5535audio-y := cs5535audio.o cs5535audio_pcm.o
|
||||
snd-cs5535audio-$(CONFIG_PM) += cs5535audio_pm.o
|
||||
|
||||
ifdef CONFIG_OLPC
|
||||
snd-cs5535audio-objs += cs5535audio_olpc.o
|
||||
endif
|
||||
snd-cs5535audio-$(CONFIG_OLPC) += cs5535audio_olpc.o
|
||||
|
||||
# Toplevel Module Dependency
|
||||
obj-$(CONFIG_SND_CS5535AUDIO) += snd-cs5535audio.o
|
||||
|
|
|
@ -174,7 +174,6 @@ static int __devinit snd_cs5535audio_mixer(struct cs5535audio *cs5535au)
|
|||
|
||||
snd_ac97_tune_hardware(cs5535au->ac97, ac97_quirks, ac97_quirk);
|
||||
|
||||
/* olpc_quirks is dummied out if not olpc */
|
||||
err = olpc_quirks(card, cs5535au->ac97);
|
||||
if (err < 0) {
|
||||
snd_printk(KERN_ERR "olpc quirks failed\n");
|
||||
|
|
|
@ -1,4 +1,14 @@
|
|||
#include <sound/driver.h>
|
||||
/*
|
||||
* OLPC XO-1 additional sound features
|
||||
*
|
||||
* Copyright © 2006 Jaya Kumar <jayakumar.lkml@gmail.com>
|
||||
* Copyright © 2007-2008 Andres Salomon <dilinger@debian.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*/
|
||||
#include <sound/core.h>
|
||||
#include <sound/info.h>
|
||||
#include <sound/control.h>
|
||||
|
@ -106,7 +116,7 @@ static struct snd_kcontrol_new olpc_cs5535audio_ctls[] __devinitdata = {
|
|||
.info = olpc_dc_info,
|
||||
.get = olpc_dc_get,
|
||||
.put = olpc_dc_put,
|
||||
.private_value = 0
|
||||
.private_value = 0,
|
||||
},
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
|
@ -161,4 +171,3 @@ int __devinit olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97)
|
|||
olpc_mic_bias(ac97, 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Reference in a new issue