Commit e958f8b8 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

ASoC: cs42l52: Convert to devm_input_allocate_device()

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent a49f0d1e
...@@ -1040,7 +1040,7 @@ static void cs42l52_init_beep(struct snd_soc_codec *codec) ...@@ -1040,7 +1040,7 @@ static void cs42l52_init_beep(struct snd_soc_codec *codec)
struct cs42l52_private *cs42l52 = snd_soc_codec_get_drvdata(codec); struct cs42l52_private *cs42l52 = snd_soc_codec_get_drvdata(codec);
int ret; int ret;
cs42l52->beep = input_allocate_device(); cs42l52->beep = devm_input_allocate_device(codec->dev);
if (!cs42l52->beep) { if (!cs42l52->beep) {
dev_err(codec->dev, "Failed to allocate beep device\n"); dev_err(codec->dev, "Failed to allocate beep device\n");
return; return;
...@@ -1061,7 +1061,6 @@ static void cs42l52_init_beep(struct snd_soc_codec *codec) ...@@ -1061,7 +1061,6 @@ static void cs42l52_init_beep(struct snd_soc_codec *codec)
ret = input_register_device(cs42l52->beep); ret = input_register_device(cs42l52->beep);
if (ret != 0) { if (ret != 0) {
input_free_device(cs42l52->beep);
cs42l52->beep = NULL; cs42l52->beep = NULL;
dev_err(codec->dev, "Failed to register beep device\n"); dev_err(codec->dev, "Failed to register beep device\n");
} }
...@@ -1078,7 +1077,6 @@ static void cs42l52_free_beep(struct snd_soc_codec *codec) ...@@ -1078,7 +1077,6 @@ static void cs42l52_free_beep(struct snd_soc_codec *codec)
struct cs42l52_private *cs42l52 = snd_soc_codec_get_drvdata(codec); struct cs42l52_private *cs42l52 = snd_soc_codec_get_drvdata(codec);
device_remove_file(codec->dev, &dev_attr_beep); device_remove_file(codec->dev, &dev_attr_beep);
input_unregister_device(cs42l52->beep);
cancel_work_sync(&cs42l52->beep_work); cancel_work_sync(&cs42l52->beep_work);
cs42l52->beep = NULL; cs42l52->beep = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment