ASoC: cs35l56: Move DSP part string generation so that it is done only once

Each time we go through dsp_work() it does a devm_kasprintf() to
allocate memory to hold the part name string. It's not strictly a memory
leak because devm will free it all if the driver is removed. But we keep
allocating more and more memory to hold the same string.

Move the allocation so that it is performed after the version and
secured state information is gathered and handle allocation errors.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/Message-Id:
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c
index 46762f7f1449f2d452effaa8267db03b93ed1de5..e4bf38873de563e36c8e63148235f9b2dabc700b 100644 (file)
--- a/sound/soc/codecs/cs35l56.c
+++ b/sound/soc/codecs/cs35l56.c
@@ -837,12 +837,6 @@ static void cs35l56_dsp_work(struct work_struct *work)
        if (!cs35l56->init_done)
                return;
 
-       cs35l56->dsp.part = devm_kasprintf(cs35l56->dev, GFP_KERNEL, "cs35l56%s-%02x",
-                                          cs35l56->secured ? "s" : "", cs35l56->rev);
-
-       if (!cs35l56->dsp.part)
-               return;
-
        pm_runtime_get_sync(cs35l56->dev);
 
        /*
@@ -1507,6 +1501,12 @@ int cs35l56_init(struct cs35l56_private *cs35l56)
        dev_info(cs35l56->dev, "Cirrus Logic CS35L56%s Rev %02X OTP%d\n",
                 cs35l56->secured ? "s" : "", cs35l56->rev, otpid);
 
+       /* Populate the DSP information with the revision and security state */
+       cs35l56->dsp.part = devm_kasprintf(cs35l56->dev, GFP_KERNEL, "cs35l56%s-%02x",
+                                          cs35l56->secured ? "s" : "", cs35l56->rev);
+       if (!cs35l56->dsp.part)
+               return -ENOMEM;
+
        /* Wake source and *_BLOCKED interrupts default to unmasked, so mask them */
        regmap_write(cs35l56->regmap, CS35L56_IRQ1_MASK_20, 0xffffffff);
        regmap_update_bits(cs35l56->regmap, CS35L56_IRQ1_MASK_1,