|
@@ -1420,9 +1420,9 @@ static int hdmi_codec_remove(struct snd_soc_codec *codec)
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_PM
|
|
|
-static int hdmi_codec_resume(struct snd_soc_codec *codec)
|
|
|
+static void hdmi_codec_complete(struct device *dev)
|
|
|
{
|
|
|
- struct hdac_ext_device *edev = snd_soc_codec_get_drvdata(codec);
|
|
|
+ struct hdac_ext_device *edev = to_hda_ext_device(dev);
|
|
|
struct hdac_hdmi_priv *hdmi = edev->private_data;
|
|
|
struct hdac_hdmi_pin *pin;
|
|
|
struct hdac_device *hdac = &edev->hdac;
|
|
@@ -1464,19 +1464,15 @@ static int hdmi_codec_resume(struct snd_soc_codec *codec)
|
|
|
dev_err(bus->dev,
|
|
|
"Cannot turn OFF display power on i915, err: %d\n",
|
|
|
err);
|
|
|
- return err;
|
|
|
}
|
|
|
-
|
|
|
- return 0;
|
|
|
}
|
|
|
#else
|
|
|
-#define hdmi_codec_resume NULL
|
|
|
+#define hdmi_codec_complete NULL
|
|
|
#endif
|
|
|
|
|
|
static struct snd_soc_codec_driver hdmi_hda_codec = {
|
|
|
.probe = hdmi_codec_probe,
|
|
|
.remove = hdmi_codec_remove,
|
|
|
- .resume = hdmi_codec_resume,
|
|
|
.idle_bias_off = true,
|
|
|
};
|
|
|
|
|
@@ -1629,6 +1625,7 @@ static int hdac_hdmi_runtime_resume(struct device *dev)
|
|
|
|
|
|
static const struct dev_pm_ops hdac_hdmi_pm = {
|
|
|
SET_RUNTIME_PM_OPS(hdac_hdmi_runtime_suspend, hdac_hdmi_runtime_resume, NULL)
|
|
|
+ .complete = hdmi_codec_complete,
|
|
|
};
|
|
|
|
|
|
static const struct hda_device_id hdmi_list[] = {
|