diff options
Diffstat (limited to 'sound/soc/codecs/aw87390.c')
| -rw-r--r-- | sound/soc/codecs/aw87390.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/aw87390.c b/sound/soc/codecs/aw87390.c index ef6f64856988..d7fd865c349f 100644 --- a/sound/soc/codecs/aw87390.c +++ b/sound/soc/codecs/aw87390.c @@ -175,7 +175,7 @@ static int aw87390_dev_set_profile_index(struct aw_device *aw_dev, int index) static int aw87390_profile_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { - struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol); + struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol); struct aw87390 *aw87390 = snd_soc_component_get_drvdata(codec); char *prof_name; int count, ret; @@ -210,7 +210,7 @@ static int aw87390_profile_info(struct snd_kcontrol *kcontrol, static int aw87390_profile_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol); + struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol); struct aw87390 *aw87390 = snd_soc_component_get_drvdata(codec); ucontrol->value.integer.value[0] = aw87390->aw_pa->prof_index; @@ -221,7 +221,7 @@ static int aw87390_profile_get(struct snd_kcontrol *kcontrol, static int aw87390_profile_set(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol); + struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol); struct aw87390 *aw87390 = snd_soc_component_get_drvdata(codec); int ret; @@ -360,7 +360,7 @@ static void aw87390_parse_channel_dt(struct aw87390 *aw87390) aw_dev->channel = channel_value; } -static int aw87390_init(struct aw87390 **aw87390, struct i2c_client *i2c, struct regmap *regmap) +static int aw87390_init(struct aw87390 *aw87390, struct i2c_client *i2c, struct regmap *regmap) { struct aw_device *aw_dev; unsigned int chip_id; @@ -384,7 +384,7 @@ static int aw87390_init(struct aw87390 **aw87390, struct i2c_client *i2c, struct if (!aw_dev) return -ENOMEM; - (*aw87390)->aw_pa = aw_dev; + aw87390->aw_pa = aw_dev; aw_dev->i2c = i2c; aw_dev->regmap = regmap; aw_dev->dev = &i2c->dev; @@ -398,7 +398,7 @@ static int aw87390_init(struct aw87390 **aw87390, struct i2c_client *i2c, struct aw_dev->prof_index = AW87390_INIT_PROFILE; aw_dev->status = AW87390_DEV_PW_OFF; - aw87390_parse_channel_dt(*aw87390); + aw87390_parse_channel_dt(aw87390); return 0; } @@ -426,7 +426,7 @@ static int aw87390_i2c_probe(struct i2c_client *i2c) "failed to init regmap\n"); /* aw pa init */ - ret = aw87390_init(&aw87390, i2c, aw87390->regmap); + ret = aw87390_init(aw87390, i2c, aw87390->regmap); if (ret) return ret; |