Skip to content

Commit

Permalink
ASoC: wm9713: Move driver state struct allocation to driver probe
Browse files Browse the repository at this point in the history
Resources for the device should be allocated in the device driver probe
callback, rather than in the ASoC CODEC probe callback.

E.g. one advantage is that we can use device managed allocations.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
larsclausen authored and broonie committed Oct 31, 2014
1 parent c1359ca commit 5efe89d
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions sound/soc/codecs/wm9713.c
Original file line number Diff line number Diff line change
Expand Up @@ -1191,17 +1191,11 @@ static int wm9713_soc_resume(struct snd_soc_codec *codec)

static int wm9713_soc_probe(struct snd_soc_codec *codec)
{
struct wm9713_priv *wm9713;
int ret = 0, reg;

wm9713 = kzalloc(sizeof(struct wm9713_priv), GFP_KERNEL);
if (wm9713 == NULL)
return -ENOMEM;
snd_soc_codec_set_drvdata(codec, wm9713);

ret = snd_soc_new_ac97_codec(codec, soc_ac97_ops, 0);
if (ret < 0)
goto codec_err;
return ret;

/* do a cold reset for the controller and then try
* a warm reset followed by an optional cold reset for codec */
Expand All @@ -1220,16 +1214,12 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec)

reset_err:
snd_soc_free_ac97_codec(codec);
codec_err:
kfree(wm9713);
return ret;
}

static int wm9713_soc_remove(struct snd_soc_codec *codec)
{
struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec);
snd_soc_free_ac97_codec(codec);
kfree(wm9713);
return 0;
}

Expand All @@ -1256,6 +1246,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9713 = {

static int wm9713_probe(struct platform_device *pdev)
{
struct wm9713_priv *wm9713;

wm9713 = devm_kzalloc(&pdev->dev, sizeof(*wm9713), GFP_KERNEL);
if (wm9713 == NULL)
return -ENOMEM;

platform_set_drvdata(pdev, wm9713);

return snd_soc_register_codec(&pdev->dev,
&soc_codec_dev_wm9713, wm9713_dai, ARRAY_SIZE(wm9713_dai));
}
Expand Down

0 comments on commit 5efe89d

Please sign in to comment.