]> git.itanic.dy.fi Git - linux-stable/commitdiff
ASoC: rt5645: Refactor rt5645_parse_dt()
authorHans de Goede <hdegoede@redhat.com>
Sun, 26 Nov 2023 21:40:20 +0000 (22:40 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 21 Dec 2023 21:00:44 +0000 (21:00 +0000)
Refactor rt5645_parse_dt(), make it take a pointer to
struct rt5645_platform_data as argument instead of passing in
the complete rt5645_priv struct.

While at it also make it void since it always succeeds.

This is a preparation patch for factoring the code to get
the platform-data out into a separate helper function.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://msgid.link/r/20231126214024.300505-4-hdegoede@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt5645.c

index 20bbdf76ffd7a631abbaabae250dcabed69120b5..7d0ad5650b44f09d411259f607c7c48d772bdd58 100644 (file)
@@ -3869,18 +3869,12 @@ static bool rt5645_check_dp(struct device *dev)
        return false;
 }
 
-static int rt5645_parse_dt(struct rt5645_priv *rt5645, struct device *dev)
+static void rt5645_parse_dt(struct device *dev, struct rt5645_platform_data *pdata)
 {
-       rt5645->pdata.in2_diff = device_property_read_bool(dev,
-               "realtek,in2-differential");
-       device_property_read_u32(dev,
-               "realtek,dmic1-data-pin", &rt5645->pdata.dmic1_data_pin);
-       device_property_read_u32(dev,
-               "realtek,dmic2-data-pin", &rt5645->pdata.dmic2_data_pin);
-       device_property_read_u32(dev,
-               "realtek,jd-mode", &rt5645->pdata.jd_mode);
-
-       return 0;
+       pdata->in2_diff = device_property_read_bool(dev, "realtek,in2-differential");
+       device_property_read_u32(dev, "realtek,dmic1-data-pin", &pdata->dmic1_data_pin);
+       device_property_read_u32(dev, "realtek,dmic2-data-pin", &pdata->dmic2_data_pin);
+       device_property_read_u32(dev, "realtek,jd-mode", &pdata->jd_mode);
 }
 
 static int rt5645_i2c_probe(struct i2c_client *i2c)
@@ -3909,7 +3903,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c)
        if (pdata)
                rt5645->pdata = *pdata;
        else if (rt5645_check_dp(&i2c->dev))
-               rt5645_parse_dt(rt5645, &i2c->dev);
+               rt5645_parse_dt(&i2c->dev, &rt5645->pdata);
        else
                rt5645->pdata = jd_mode3_platform_data;