Commit 58b65f6d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soundwire-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire 

Pull soundwire updates from Vinod Koul:
 "A very small update this time

   - add few registers to debugfs

   - core: drop dev_pm_domain_detach() call and use min() to improve
     code"

* tag 'soundwire-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
  soundwire: Use min() to improve code
  soundwire: bus: Drop dev_pm_domain_detach() call
  soundwire: debugfs: add SCP_SDCA_IntStatX and SCP_SDCA_IntMaskX registers
parents fd94619c 88f5d2a4

drivers/soundwire/bus_type.c

+0 −3
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ static int sdw_drv_probe(struct device *dev) 


	ret = drv->probe(slave, id);

	if (ret) {

		dev_pm_domain_detach(dev, false);

		ida_free(&slave->bus->slave_ida, slave->index);

		return ret;

	}
@@ -180,8 +179,6 @@ static int sdw_drv_remove(struct device *dev) 
	if (drv->remove)

		ret = drv->remove(slave);



	dev_pm_domain_detach(dev, false);



	ida_free(&slave->bus->slave_ida, slave->index);



	return ret;

drivers/soundwire/debugfs.c

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ static int sdw_slave_reg_show(struct seq_file *s_file, void *data) 
		ret += sdw_sprintf(slave, buf, ret, i);

	for (i = SDW_SCP_DEVID_0; i <= SDW_SCP_DEVID_5; i++)

		ret += sdw_sprintf(slave, buf, ret, i);

	for (i = SDW_SCP_SDCA_INT1; i <= SDW_SCP_SDCA_INTMASK4; i++)

		ret += sdw_sprintf(slave, buf, ret, i);

	for (i = SDW_SCP_FRAMECTRL_B0; i <= SDW_SCP_BUSCLOCK_SCALE_B0; i++)

		ret += sdw_sprintf(slave, buf, ret, i);

	for (i = SDW_SCP_FRAMECTRL_B1; i <= SDW_SCP_BUSCLOCK_SCALE_B1; i++)

drivers/soundwire/qcom.c

+1 −4
Original line number Diff line number Diff line
@@ -924,10 +924,7 @@ static enum sdw_command_response qcom_swrm_xfer_msg(struct sdw_bus *bus, 


	if (msg->flags == SDW_MSG_FLAG_READ) {

		for (i = 0; i < msg->len;) {

			if ((msg->len - i) < QCOM_SWRM_MAX_RD_LEN)

				len = msg->len - i;

			else

				len = QCOM_SWRM_MAX_RD_LEN;

			len = min(msg->len - i, QCOM_SWRM_MAX_RD_LEN);



			ret = qcom_swrm_cmd_fifo_rd_cmd(ctrl, msg->dev_num,

							msg->addr + i, len,