projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ASoC: Add indirection for CODEC private data
[firefly-linux-kernel-4.4.55.git]
/
sound
/
soc
/
codecs
/
wm8955.c
diff --git
a/sound/soc/codecs/wm8955.c
b/sound/soc/codecs/wm8955.c
index 615dab2b62ef46a09841b0f5cf5edea2f379fa72..5f0bde56cf0d0ac9ce0a889f9d6a8afc743f62aa 100644
(file)
--- a/
sound/soc/codecs/wm8955.c
+++ b/
sound/soc/codecs/wm8955.c
@@
-234,7
+234,7
@@
static struct {
static int wm8955_configure_clocking(struct snd_soc_codec *codec)
{
static int wm8955_configure_clocking(struct snd_soc_codec *codec)
{
- struct wm8955_priv *wm8955 =
codec->private_data
;
+ struct wm8955_priv *wm8955 =
snd_soc_codec_get_drvdata(codec)
;
int i, ret, val;
int clocking = 0;
int srate = 0;
int i, ret, val;
int clocking = 0;
int srate = 0;
@@
-352,7
+352,7
@@
static int deemph_settings[] = { 0, 32000, 44100, 48000 };
static int wm8955_set_deemph(struct snd_soc_codec *codec)
{
static int wm8955_set_deemph(struct snd_soc_codec *codec)
{
- struct wm8955_priv *wm8955 =
codec->private_data
;
+ struct wm8955_priv *wm8955 =
snd_soc_codec_get_drvdata(codec)
;
int val, i, best;
/* If we're using deemphasis select the nearest available sample
int val, i, best;
/* If we're using deemphasis select the nearest available sample
@@
-381,7
+381,7
@@
static int wm8955_get_deemph(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct wm8955_priv *wm8955 =
codec->private_data
;
+ struct wm8955_priv *wm8955 =
snd_soc_codec_get_drvdata(codec)
;
return wm8955->deemph;
}
return wm8955->deemph;
}
@@
-390,7
+390,7
@@
static int wm8955_put_deemph(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct wm8955_priv *wm8955 =
codec->private_data
;
+ struct wm8955_priv *wm8955 =
snd_soc_codec_get_drvdata(codec)
;
int deemph = ucontrol->value.enumerated.item[0];
if (deemph > 1)
int deemph = ucontrol->value.enumerated.item[0];
if (deemph > 1)
@@
-597,7
+597,7
@@
static int wm8955_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
struct snd_soc_codec *codec = dai->codec;
struct snd_soc_dai *dai)
{
struct snd_soc_codec *codec = dai->codec;
- struct wm8955_priv *wm8955 =
codec->private_data
;
+ struct wm8955_priv *wm8955 =
snd_soc_codec_get_drvdata(codec)
;
int ret;
int wl;
int ret;
int wl;
@@
-646,7
+646,7
@@
static int wm8955_set_sysclk(struct snd_soc_dai *dai, int clk_id,
unsigned int freq, int dir)
{
struct snd_soc_codec *codec = dai->codec;
unsigned int freq, int dir)
{
struct snd_soc_codec *codec = dai->codec;
- struct wm8955_priv *priv =
codec->private_data
;
+ struct wm8955_priv *priv =
snd_soc_codec_get_drvdata(codec)
;
int div;
switch (clk_id) {
int div;
switch (clk_id) {
@@
-769,7
+769,7
@@
static int wm8955_digital_mute(struct snd_soc_dai *codec_dai, int mute)
static int wm8955_set_bias_level(struct snd_soc_codec *codec,
enum snd_soc_bias_level level)
{
static int wm8955_set_bias_level(struct snd_soc_codec *codec,
enum snd_soc_bias_level level)
{
- struct wm8955_priv *wm8955 =
codec->private_data
;
+ struct wm8955_priv *wm8955 =
snd_soc_codec_get_drvdata(codec)
;
int ret, i;
switch (level) {
int ret, i;
switch (level) {
@@
-970,7
+970,7
@@
static int wm8955_register(struct wm8955_priv *wm8955,
INIT_LIST_HEAD(&codec->dapm_widgets);
INIT_LIST_HEAD(&codec->dapm_paths);
INIT_LIST_HEAD(&codec->dapm_widgets);
INIT_LIST_HEAD(&codec->dapm_paths);
-
codec->private_data = wm8955
;
+
snd_soc_codec_set_drvdata(codec, wm8955)
;
codec->name = "WM8955";
codec->owner = THIS_MODULE;
codec->bias_level = SND_SOC_BIAS_OFF;
codec->name = "WM8955";
codec->owner = THIS_MODULE;
codec->bias_level = SND_SOC_BIAS_OFF;