ASoC: Intel: boards: use software node API in Atom boards

[platform/kernel/linux-starfive.git] / sound / soc / intel / boards / bytcht_es8316.c

diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c
index f3919ba..055248f 100644 (file)
--- a/sound/soc/intel/boards/bytcht_es8316.c
+++ b/sound/soc/intel/boards/bytcht_es8316.c
@@ -462,6 +462,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
        const struct dmi_system_id *dmi_id;
        struct device *dev = &pdev->dev;
        struct snd_soc_acpi_mach *mach;
+       struct fwnode_handle *fwnode;
        const char *platform_name;
        struct acpi_device *adev;
        struct device *codec_dev;
@@ -548,7 +549,16 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
                props[cnt++] = PROPERTY_ENTRY_BOOL("everest,jack-detect-inverted");
 
        if (cnt) {
-               ret = device_add_properties(codec_dev, props);
+               fwnode = fwnode_create_software_node(props, NULL);
+               if (IS_ERR(fwnode)) {
+                       put_device(codec_dev);
+                       return PTR_ERR(fwnode);
+               }
+
+               ret = device_add_software_node(codec_dev, to_software_node(fwnode));
+
+               fwnode_handle_put(fwnode);
+
                if (ret) {
                        put_device(codec_dev);
                        return ret;
@@ -615,7 +625,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
        return 0;
 
 err_put_codec:
-       device_remove_properties(priv->codec_dev);
+       device_remove_software_node(priv->codec_dev);
        put_device(priv->codec_dev);
        return ret;
 }
@@ -626,7 +636,7 @@ static int snd_byt_cht_es8316_mc_remove(struct platform_device *pdev)
        struct byt_cht_es8316_private *priv = snd_soc_card_get_drvdata(card);
 
        gpiod_put(priv->speaker_en_gpio);
-       device_remove_properties(priv->codec_dev);
+       device_remove_software_node(priv->codec_dev);
        put_device(priv->codec_dev);
        return 0;
 }