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 <[email protected]>
Cc: Nicolin Chen <[email protected]>
Cc: Xiubo Li <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Rob Herring <[email protected]>
---
 sound/soc/fsl/fsl-asoc-card.c       | 6 +++---
 sound/soc/generic/simple-scu-card.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index 44433b20435c..81f2fe2c6d23 100644
--- 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 85b46f0eae0f..e9a1acffcf5b 100644
--- a/sound/soc/generic/simple-scu-card.c
+++ b/sound/soc/generic/simple-scu-card.c
@@ -216,7 +216,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);
-- 
2.19.1

Reply via email to