soundwire/ASoC: add leading zeroes in peripheral device name

We recently added leading zeroes in dev_dbg() messages but forgot to
do the same for the peripheral device name. Adding leading zeroes
makes it easier to read manufacturer ID and part ID, e.g.:

sdw:0:025d:0700:00
sdw:0:025d:0711:00
sdw:1:025d:0700:00
sdw:1:025d:1308:00
sdw:2:025d:0700:00
sdw:2:025d:0701:00
sdw:3:025d:0700:00
sdw:3:025d:0715:00

The use of '01x' for link_id and unique_id is intentional to show the
value range in the code, it's understood it does not actually change
the format.

To avoid problems with git bisect, the same change needs to be applied
to the Intel SoundWire machine driver, otherwise the components can't
be found and the card registration fails.

Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20210511060137.29856-1-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c
index 0eed38a79c6dd1a01d95bb50e556a42018784ac9..669d7573320b7220fc65564fcc80e4cdb948eead 100644 (file)
--- a/drivers/soundwire/slave.c
+++ b/drivers/soundwire/slave.c
@@ -39,12 +39,12 @@ int sdw_slave_add(struct sdw_bus *bus,
 
        if (id->unique_id == SDW_IGNORED_UNIQUE_ID) {
                /* name shall be sdw:link:mfg:part:class */
-               dev_set_name(&slave->dev, "sdw:%x:%x:%x:%x",
+               dev_set_name(&slave->dev, "sdw:%01x:%04x:%04x:%02x",
                             bus->link_id, id->mfg_id, id->part_id,
                             id->class_id);
        } else {
                /* name shall be sdw:link:mfg:part:class:unique */
-               dev_set_name(&slave->dev, "sdw:%x:%x:%x:%x:%x",
+               dev_set_name(&slave->dev, "sdw:%01x:%04x:%04x:%02x:%01x",
                             bus->link_id, id->mfg_id, id->part_id,
                             id->class_id, id->unique_id);
        }

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index ecd3f90f4bbea263695e2906b3aee653158a8c57..8df1e69235cc73e00db820dfc58c6a2caf6690de 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -581,13 +581,13 @@ static int create_codec_dai_name(struct device *dev,
                comp_index = i + offset;
                if (is_unique_device(link, sdw_version, mfg_id, part_id,
                                     class_id, i)) {
-                       codec_str = "sdw:%x:%x:%x:%x";
+                       codec_str = "sdw:%01x:%04x:%04x:%02x";
                        codec[comp_index].name =
                                devm_kasprintf(dev, GFP_KERNEL, codec_str,
                                               link_id, mfg_id, part_id,
                                               class_id);
                } else {
-                       codec_str = "sdw:%x:%x:%x:%x:%x";
+                       codec_str = "sdw:%01x:%04x:%04x:%02x:%01x";
                        codec[comp_index].name =
                                devm_kasprintf(dev, GFP_KERNEL, codec_str,
                                               link_id, mfg_id, part_id,