ASoC: hdac_hdmi: Remove temporary string use in create_fill_jack_kcontrols

There is no need to use temporary strings to construct the kcontrol names,
devm_kasprintf can be used to replace the snprintf + devm_kstrdup pairs.

This change will also fixes the following compiler warning/error (W=1):

sound/soc/codecs/hdac_hdmi.c: In function ‘hdac_hdmi_jack_port_init’:
sound/soc/codecs/hdac_hdmi.c:1793:63: error: ‘ Switch’ directive output may be truncated writing 7 bytes into a region of size between 1 and 32 [-Werror=format-truncation=]
 1793 |                         snprintf(kc_name, sizeof(kc_name), "%s Switch", xname);
      |                                                               ^~~~~~~
In function ‘create_fill_jack_kcontrols’,
    inlined from ‘hdac_hdmi_jack_port_init’ at sound/soc/codecs/hdac_hdmi.c:1871:8:
sound/soc/codecs/hdac_hdmi.c:1793:25: note: ‘snprintf’ output between 8 and 39 bytes into a destination of size 32
 1793 |                         snprintf(kc_name, sizeof(kc_name), "%s Switch", xname);
      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

The warnings got brought to light by a recent patch upstream:
commit 6d4ab2e97dcf ("extrawarn: enable format and stringop overflow warnings in W=1")

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230913091325.16877-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
index 8b6b7602969488cd1511d6b05b68416c28833f7e..b9c5ffbfb5ba9696dc3891903248db5b07b7bbf6 100644 (file)
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@ -1771,7 +1771,6 @@ static int create_fill_jack_kcontrols(struct snd_soc_card *card,
 {
        struct hdac_hdmi_pin *pin;
        struct snd_kcontrol_new *kc;
-       char kc_name[NAME_SIZE], xname[NAME_SIZE];
        char *name;
        int i = 0, j;
        struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
@@ -1785,14 +1784,14 @@ static int create_fill_jack_kcontrols(struct snd_soc_card *card,
 
        list_for_each_entry(pin, &hdmi->pin_list, head) {
                for (j = 0; j < pin->num_ports; j++) {
-                       snprintf(xname, sizeof(xname), "hif%d-%d Jack",
-                                               pin->nid, pin->ports[j].id);
-                       name = devm_kstrdup(component->dev, xname, GFP_KERNEL);
+                       name = devm_kasprintf(component->dev, GFP_KERNEL,
+                                             "hif%d-%d Jack",
+                                             pin->nid, pin->ports[j].id);
                        if (!name)
                                return -ENOMEM;
-                       snprintf(kc_name, sizeof(kc_name), "%s Switch", xname);
-                       kc[i].name = devm_kstrdup(component->dev, kc_name,
-                                                       GFP_KERNEL);
+
+                       kc[i].name = devm_kasprintf(component->dev, GFP_KERNEL,
+                                                   "%s Switch", name);
                        if (!kc[i].name)
                                return -ENOMEM;