ASoC: cs42l56: fix DT probe
authorArnd Bergmann <arnd@arndb.de>
Thu, 26 Jan 2023 16:21:24 +0000 (17:21 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 26 Jan 2023 17:42:36 +0000 (17:42 +0000)
While looking through legacy platform data users, I noticed that
the DT probing never uses data from the DT properties, as the
platform_data structure gets overwritten directly after it
is initialized.

There have never been any boards defining the platform_data in
the mainline kernel either, so this driver so far only worked
with patched kernels or with the default values.

For the benefit of possible downstream users, fix the DT probe
by no longer overwriting the data.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230126162203.2986339-1-arnd@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/cs42l56.c

index 2606668..3b0e715 100644 (file)
@@ -1191,18 +1191,12 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client)
        if (pdata) {
                cs42l56->pdata = *pdata;
        } else {
-               pdata = devm_kzalloc(&i2c_client->dev, sizeof(*pdata),
-                                    GFP_KERNEL);
-               if (!pdata)
-                       return -ENOMEM;
-
                if (i2c_client->dev.of_node) {
                        ret = cs42l56_handle_of_data(i2c_client,
                                                     &cs42l56->pdata);
                        if (ret != 0)
                                return ret;
                }
-               cs42l56->pdata = *pdata;
        }
 
        if (cs42l56->pdata.gpio_nreset) {