Commit c397efb7 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

soundwire: use consistent format for Slave devID logs 



We mix decimal and hexadecimal values, this leads to confusions in
dmesg logs and bug reports. Let's add a 0x prefix for all hexadecimal
values and a format when more than 4 bits are used.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20210115053738.22630-2-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent ee3db942

drivers/soundwire/bus.c

+2 −3
Original line number Diff line number Diff line
@@ -679,9 +679,8 @@ void sdw_extract_slave_id(struct sdw_bus *bus, 
	id->class_id = SDW_CLASS_ID(addr);



	dev_dbg(bus->dev,

		"SDW Slave class_id %x, part_id %x, mfg_id %x, unique_id %x, version %x\n",

				id->class_id, id->part_id, id->mfg_id,

				id->unique_id, id->sdw_version);

		"SDW Slave class_id 0x%02x, mfg_id 0x%04x, part_id 0x%04x, unique_id 0x%x, version 0x%x\n",

		id->class_id, id->mfg_id, id->part_id, id->unique_id, id->sdw_version);

}



static int sdw_program_device_num(struct sdw_bus *bus)

drivers/soundwire/slave.c

+4 −6
Original line number Diff line number Diff line
@@ -163,15 +163,13 @@ int sdw_acpi_find_slaves(struct sdw_bus *bus) 


			if (id.unique_id != id2.unique_id) {

				dev_dbg(bus->dev,

					"Valid unique IDs %x %x for Slave mfg %x part %d\n",

					id.unique_id, id2.unique_id,

					id.mfg_id, id.part_id);

					"Valid unique IDs 0x%x 0x%x for Slave mfg_id 0x%04x, part_id 0x%04x\n",

					id.unique_id, id2.unique_id, id.mfg_id, id.part_id);

				ignore_unique_id = false;

			} else {

				dev_err(bus->dev,

					"Invalid unique IDs %x %x for Slave mfg %x part %d\n",

					id.unique_id, id2.unique_id,

					id.mfg_id, id.part_id);

					"Invalid unique IDs 0x%x 0x%x for Slave mfg_id 0x%04x, part_id 0x%04x\n",

					id.unique_id, id2.unique_id, id.mfg_id, id.part_id);

				return -ENODEV;

			}

		}