projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
[platform/kernel/linux-starfive.git]
/
sound
/
soc
/
codecs
/
max98088.c
diff --git
a/sound/soc/codecs/max98088.c
b/sound/soc/codecs/max98088.c
index
6447dbb
..
89498f9
100644
(file)
--- a/
sound/soc/codecs/max98088.c
+++ b/
sound/soc/codecs/max98088.c
@@
-20,7
+20,6
@@
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
-#include <sound/soc-dapm.h>
#include <sound/initval.h>
#include <sound/tlv.h>
#include <linux/slab.h>
#include <sound/initval.h>
#include <sound/tlv.h>
#include <linux/slab.h>
@@
-1229,15
+1228,17
@@
static const struct snd_soc_dapm_route audio_map[] = {
static int max98088_add_widgets(struct snd_soc_codec *codec)
{
static int max98088_add_widgets(struct snd_soc_codec *codec)
{
- snd_soc_dapm_new_controls(codec, max98088_dapm_widgets,
+ struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+ snd_soc_dapm_new_controls(dapm, max98088_dapm_widgets,
ARRAY_SIZE(max98088_dapm_widgets));
ARRAY_SIZE(max98088_dapm_widgets));
- snd_soc_dapm_add_routes(
codec
, audio_map, ARRAY_SIZE(audio_map));
+ snd_soc_dapm_add_routes(
dapm
, audio_map, ARRAY_SIZE(audio_map));
snd_soc_add_controls(codec, max98088_snd_controls,
ARRAY_SIZE(max98088_snd_controls));
snd_soc_add_controls(codec, max98088_snd_controls,
ARRAY_SIZE(max98088_snd_controls));
- snd_soc_dapm_new_widgets(
codec
);
+ snd_soc_dapm_new_widgets(
dapm
);
return 0;
}
return 0;
}
@@
-1622,7
+1623,7
@@
static int max98088_set_bias_level(struct snd_soc_codec *codec,
break;
case SND_SOC_BIAS_STANDBY:
break;
case SND_SOC_BIAS_STANDBY:
- if (codec->bias_level == SND_SOC_BIAS_OFF)
+ if (codec->
dapm.
bias_level == SND_SOC_BIAS_OFF)
max98088_sync_cache(codec);
snd_soc_update_bits(codec, M98088_REG_4C_PWR_EN_IN,
max98088_sync_cache(codec);
snd_soc_update_bits(codec, M98088_REG_4C_PWR_EN_IN,
@@
-1635,7
+1636,7
@@
static int max98088_set_bias_level(struct snd_soc_codec *codec,
codec->cache_sync = 1;
break;
}
codec->cache_sync = 1;
break;
}
- codec->bias_level = level;
+ codec->
dapm.
bias_level = level;
return 0;
}
return 0;
}
@@
-1957,7
+1958,7
@@
static int max98088_probe(struct snd_soc_codec *codec)
return ret;
}
return ret;
}
- /* initalize private data */
+ /* init
i
alize private data */
max98088->sysclk = (unsigned)-1;
max98088->eq_textcnt = 0;
max98088->sysclk = (unsigned)-1;
max98088->eq_textcnt = 0;