ASoC: Use of_node_name_eq for node name comparisons

Convert string compares of DT node names to use of_node_name_eq helper
instead. This removes direct access to the node name pointer.

For the FSL ASoC card, the full node names appear to be "ssi", "esai",
and "sai", so there's not any reason to use strstr and of_node_name_eq
can be used instead.

Cc: Timur Tabi <timur@kernel.org>
Cc: Nicolin Chen <nicoleotsuka@gmail.com>
Cc: Xiubo Li <Xiubo.Lee@gmail.com>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
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: alsa-devel@alsa-project.org
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index 44433b20435cce7778ea72ee54adf8445dbaca31..81f2fe2c6d230260f422640054b9a1827fb60376 100644 (file)
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -571,17 +571,17 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
        }
 
        /* Common settings for corresponding Freescale CPU DAI driver */
-       if (strstr(cpu_np->name, "ssi")) {
+       if (of_node_name_eq(cpu_np, "ssi")) {
                /* Only SSI needs to configure AUDMUX */
                ret = fsl_asoc_card_audmux_init(np, priv);
                if (ret) {
                        dev_err(&pdev->dev, "failed to init audmux\n");
                        goto asrc_fail;
                }
-       } else if (strstr(cpu_np->name, "esai")) {
+       } else if (of_node_name_eq(cpu_np, "esai")) {
                priv->cpu_priv.sysclk_id[1] = ESAI_HCKT_EXTAL;
                priv->cpu_priv.sysclk_id[0] = ESAI_HCKR_EXTAL;
-       } else if (strstr(cpu_np->name, "sai")) {
+       } else if (of_node_name_eq(cpu_np, "sai")) {
                priv->cpu_priv.sysclk_id[1] = FSL_SAI_CLK_MAST1;
                priv->cpu_priv.sysclk_id[0] = FSL_SAI_CLK_MAST1;
        }

diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c
index 7ae1901b2f851857c1b00193955f8f9c2bd0f1c0..656abe2015e1c9868c1dd39d5934e46b09c074eb 100644 (file)
--- a/sound/soc/generic/simple-scu-card.c
+++ b/sound/soc/generic/simple-scu-card.c
@@ -223,7 +223,7 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv)
        i = 0;
        for_each_child_of_node(node, np) {
                is_fe = false;
-               if (strcmp(np->name, PREFIX "cpu") == 0)
+               if (of_node_name_eq(np, PREFIX "cpu"))
                        is_fe = true;
 
                ret = asoc_simple_card_dai_link_of(np, priv, daifmt, i, is_fe);