ASoC: codecs: wcd938x: Make use of the helper component_compare/release_of

Use the common compare/release helpers from component.

Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: alsa-devel@alsa-project.org
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Link: https://lore.kernel.org/r/20220214060819.7334-21-yong.wu@mediatek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c
index eff200a..54f4a41 100644 (file)
--- a/sound/soc/codecs/wcd938x.c
+++ b/sound/soc/codecs/wcd938x.c
@@ -4417,16 +4417,6 @@ static const struct component_master_ops wcd938x_comp_ops = {
        .unbind = wcd938x_unbind,
 };
 
-static int wcd938x_compare_of(struct device *dev, void *data)
-{
-       return dev->of_node == data;
-}
-
-static void wcd938x_release_of(struct device *dev, void *data)
-{
-       of_node_put(data);
-}
-
 static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x,
                                        struct device *dev,
                                        struct component_match **matchptr)
@@ -4442,8 +4432,8 @@ static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x,
        }
 
        of_node_get(wcd938x->rxnode);
-       component_match_add_release(dev, matchptr, wcd938x_release_of,
-                                   wcd938x_compare_of, wcd938x->rxnode);
+       component_match_add_release(dev, matchptr, component_release_of,
+                                   component_compare_of, wcd938x->rxnode);
 
        wcd938x->txnode = of_parse_phandle(np, "qcom,tx-device", 0);
        if (!wcd938x->txnode) {
@@ -4451,8 +4441,8 @@ static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x,
                return -ENODEV;
        }
        of_node_get(wcd938x->txnode);
-       component_match_add_release(dev, matchptr, wcd938x_release_of,
-                                   wcd938x_compare_of, wcd938x->txnode);
+       component_match_add_release(dev, matchptr, component_release_of,
+                                   component_compare_of, wcd938x->txnode);
        return 0;
 }