OSDN Git Service

ASoC: Intel: bdw-rt5677: Switch to devm_acpi_dev_add_driver_gpios()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 15 Jun 2017 12:46:38 +0000 (15:46 +0300)
committerMark Brown <broonie@kernel.org>
Fri, 16 Jun 2017 16:53:25 +0000 (17:53 +0100)
Switch to use managed variant of acpi_dev_add_driver_gpios() to simplify
error path and fix potentially wrong assignment if ->probe() fails.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/bdw-rt5677.c

index bb98e94..058b8cc 100644 (file)
@@ -207,8 +207,7 @@ static int bdw_rt5677_init(struct snd_soc_pcm_runtime *rtd)
        struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
        int ret;
 
-       ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(codec->dev),
-                       bdw_rt5677_gpios);
+       ret = devm_acpi_dev_add_driver_gpios(codec->dev, bdw_rt5677_gpios);
        if (ret)
                dev_warn(codec->dev, "Failed to add driver gpios\n");