projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
[powerpc.git]
/
sound
/
ppc
/
daca.c
diff --git
a/sound/ppc/daca.c
b/sound/ppc/daca.c
index
46eebf5
..
c5a1f0b
100644
(file)
--- a/
sound/ppc/daca.c
+++ b/
sound/ppc/daca.c
@@
-91,15
+91,7
@@
static int daca_set_volume(struct pmac_daca *mix)
/* deemphasis switch */
/* deemphasis switch */
-static int daca_info_deemphasis(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_info *uinfo)
-{
- uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
- uinfo->count = 1;
- uinfo->value.integer.min = 0;
- uinfo->value.integer.max = 1;
- return 0;
-}
+#define daca_info_deemphasis snd_ctl_boolean_mono_info
static int daca_get_deemphasis(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
static int daca_get_deemphasis(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
@@
-258,10
+250,9
@@
int __init snd_pmac_daca_init(struct snd_pmac *chip)
request_module("i2c-powermac");
#endif /* CONFIG_KMOD */
request_module("i2c-powermac");
#endif /* CONFIG_KMOD */
- mix = k
m
alloc(sizeof(*mix), GFP_KERNEL);
+ mix = k
z
alloc(sizeof(*mix), GFP_KERNEL);
if (! mix)
return -ENOMEM;
if (! mix)
return -ENOMEM;
- memset(mix, 0, sizeof(*mix));
chip->mixer_data = mix;
chip->mixer_free = daca_cleanup;
mix->amp_on = 1; /* default on */
chip->mixer_data = mix;
chip->mixer_free = daca_cleanup;
mix->amp_on = 1; /* default on */