diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-07 10:21:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-07 10:21:22 +0100 |
| commit | 387f837b3d9f9a989ae9a6deab543e1948b58ce8 (patch) | |
| tree | 6c471e04be1d304ce462da258103162f127af78d /sound/soc/codecs/si476x.c | |
| parent | d98812082c87732b45c71d63afc6a9ba3cca3f03 (diff) | |
| parent | 4da533932dedff930596bc536adaba1e508f9ffa (diff) | |
| download | op-kernel-dev-387f837b3d9f9a989ae9a6deab543e1948b58ce8.zip op-kernel-dev-387f837b3d9f9a989ae9a6deab543e1948b58ce8.tar.gz | |
Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core
Diffstat (limited to 'sound/soc/codecs/si476x.c')
| -rw-r--r-- | sound/soc/codecs/si476x.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sound/soc/codecs/si476x.c b/sound/soc/codecs/si476x.c index 244c097..f26befb 100644 --- a/sound/soc/codecs/si476x.c +++ b/sound/soc/codecs/si476x.c @@ -208,13 +208,6 @@ out: return err; } -static int si476x_codec_probe(struct snd_soc_codec *codec) -{ - struct regmap *regmap = dev_get_regmap(codec->dev->parent, NULL); - - return snd_soc_codec_set_cache_io(codec, regmap); -} - static struct snd_soc_dai_ops si476x_dai_ops = { .hw_params = si476x_codec_hw_params, .set_fmt = si476x_codec_set_dai_fmt, @@ -238,8 +231,13 @@ static struct snd_soc_dai_driver si476x_dai = { .ops = &si476x_dai_ops, }; +static struct regmap *si476x_get_regmap(struct device *dev) +{ + return dev_get_regmap(dev->parent, NULL); +} + static struct snd_soc_codec_driver soc_codec_dev_si476x = { - .probe = si476x_codec_probe, + .get_regmap = si476x_get_regmap, .dapm_widgets = si476x_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(si476x_dapm_widgets), .dapm_routes = si476x_dapm_routes, |
