ASoC: Drop unnecessary of_match_device() calls

If probe is reached, we've already matched the device and in the case of
DT matching, the struct device_node pointer will be set. Therefore, there
is no need to call of_match_device() in probe.

Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20231006-dt-asoc-header-cleanups-v3-2-13a4f0f7fee6@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/ak5386.c b/sound/soc/codecs/ak5386.c
index 0c5e00679c7d8e47ee14d4e15ce8e19850050f11..21a44476f48db36bac464c8485d5821353bda185 100644 (file)
--- a/sound/soc/codecs/ak5386.c
+++ b/sound/soc/codecs/ak5386.c
@@ -10,7 +10,6 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
-#include <linux/of_device.h>
 #include <linux/regulator/consumer.h>
 #include <sound/soc.h>
 #include <sound/pcm.h>
@@ -168,7 +167,6 @@ static int ak5386_probe(struct platform_device *pdev)
        if (!priv)
                return -ENOMEM;
 
-       priv->reset_gpio = -EINVAL;
        dev_set_drvdata(dev, priv);
 
        for (i = 0; i < ARRAY_SIZE(supply_names); i++)
@@ -179,9 +177,8 @@ static int ak5386_probe(struct platform_device *pdev)
        if (ret < 0)
                return ret;
 
-       if (of_match_device(of_match_ptr(ak5386_dt_ids), dev))
-               priv->reset_gpio = of_get_named_gpio(dev->of_node,
-                                                     "reset-gpio", 0);
+       priv->reset_gpio = of_get_named_gpio(dev->of_node,
+                                            "reset-gpio", 0);
 
        if (gpio_is_valid(priv->reset_gpio))
                if (devm_gpio_request_one(dev, priv->reset_gpio,

diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index 188b8b43c524f21fc9758877c459d8e149c8b7f9..9e6f8a048dd59145f25a2fd809c1d43f76351faa 100644 (file)
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -15,7 +15,6 @@
 #include <linux/delay.h>
 #include <linux/gpio.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include <linux/regulator/consumer.h>
 #include <sound/pcm.h>
@@ -563,19 +562,12 @@ static int cs4271_component_probe(struct snd_soc_component *component)
        struct cs4271_private *cs4271 = snd_soc_component_get_drvdata(component);
        struct cs4271_platform_data *cs4271plat = component->dev->platform_data;
        int ret;
-       bool amutec_eq_bmutec = false;
+       bool amutec_eq_bmutec;
 
-#ifdef CONFIG_OF
-       if (of_match_device(cs4271_dt_ids, component->dev)) {
-               if (of_get_property(component->dev->of_node,
-                                    "cirrus,amutec-eq-bmutec", NULL))
-                       amutec_eq_bmutec = true;
-
-               if (of_get_property(component->dev->of_node,
-                                    "cirrus,enable-soft-reset", NULL))
-                       cs4271->enable_soft_reset = true;
-       }
-#endif
+       amutec_eq_bmutec = of_property_read_bool(component->dev->of_node,
+                                                "cirrus,amutec-eq-bmutec");
+       cs4271->enable_soft_reset = of_property_read_bool(component->dev->of_node,
+                                                         "cirrus,enable-soft-reset");
 
        ret = regulator_bulk_enable(ARRAY_SIZE(cs4271->supplies),
                                    cs4271->supplies);
@@ -655,9 +647,7 @@ static int cs4271_common_probe(struct device *dev,
        if (!cs4271)
                return -ENOMEM;
 
-       if (of_match_device(cs4271_dt_ids, dev))
-               cs4271->gpio_nreset =
-                       of_get_named_gpio(dev->of_node, "reset-gpio", 0);
+       cs4271->gpio_nreset = of_get_named_gpio(dev->of_node, "reset-gpio", 0);
 
        if (cs4271plat)
                cs4271->gpio_nreset = cs4271plat->gpio_nreset;

diff --git a/sound/soc/codecs/tas5086.c b/sound/soc/codecs/tas5086.c
index 60e59e993ba6687242262b5ce5d5b2f02d78e2d7..f52c14b43f28712a99ab68bab85cd0fc9aa0a872 100644 (file)
--- a/sound/soc/codecs/tas5086.c
+++ b/sound/soc/codecs/tas5086.c
@@ -940,11 +940,7 @@ static int tas5086_i2c_probe(struct i2c_client *i2c)
 
        i2c_set_clientdata(i2c, priv);
 
-       if (of_match_device(of_match_ptr(tas5086_dt_ids), dev)) {
-               struct device_node *of_node = dev->of_node;
-               gpio_nreset = of_get_named_gpio(of_node, "reset-gpio", 0);
-       }
-
+       gpio_nreset = of_get_named_gpio(dev->of_node, "reset-gpio", 0);
        if (gpio_is_valid(gpio_nreset))
                if (devm_gpio_request(dev, gpio_nreset, "TAS5086 Reset"))
                        gpio_nreset = -EINVAL;