diff options
| author | Jeremy McDermond <nh6z@nh6z.net> | 2016-04-19 02:24:04 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-04-19 11:54:20 +0200 |
| commit | ec513886411e4fc47f98607a1bc79b72899710c4 (patch) | |
| tree | 90706a2a478579d4455fc3c123bf925535793b7e | |
| parent | Linux 4.6-rc1 (diff) | |
| download | linux-ec513886411e4fc47f98607a1bc79b72899710c4.tar.xz linux-ec513886411e4fc47f98607a1bc79b72899710c4.zip | |
ASoC: tlv320aic32x4: Change name of probe function
The codec's probe function is named aic32x4_probe. This is going to
conflict with later work to implement SPI support and separate out I2S
into its own file. In line with other drivers in the tree, this function
is renamed to aic32x4_codec_probe instead.
Signed-off-by: Jeremy McDermond <nh6z@nh6z.net>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/codecs/tlv320aic32x4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index f2d3191961e1..9d5b08b80d24 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -596,7 +596,7 @@ static struct snd_soc_dai_driver aic32x4_dai = { .symmetric_rates = 1, }; -static int aic32x4_probe(struct snd_soc_codec *codec) +static int aic32x4_codec_probe(struct snd_soc_codec *codec) { struct aic32x4_priv *aic32x4 = snd_soc_codec_get_drvdata(codec); u32 tmp_reg; @@ -655,7 +655,7 @@ static int aic32x4_probe(struct snd_soc_codec *codec) } static struct snd_soc_codec_driver soc_codec_dev_aic32x4 = { - .probe = aic32x4_probe, + .probe = aic32x4_codec_probe, .set_bias_level = aic32x4_set_bias_level, .suspend_bias_off = true, |