Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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
-3
drivers/soundwire/bus_type.c
-3
drivers/soundwire/bus_type.c
···
114
114
115
115
ret = drv->probe(slave, id);
116
116
if (ret) {
117
-
dev_pm_domain_detach(dev, false);
118
117
ida_free(&slave->bus->slave_ida, slave->index);
119
118
return ret;
120
119
}
···
178
179
179
180
if (drv->remove)
180
181
ret = drv->remove(slave);
181
-
182
-
dev_pm_domain_detach(dev, false);
183
182
184
183
ida_free(&slave->bus->slave_ida, slave->index);
185
184
+2
drivers/soundwire/debugfs.c
+2
drivers/soundwire/debugfs.c
···
91
91
ret += sdw_sprintf(slave, buf, ret, i);
92
92
for (i = SDW_SCP_DEVID_0; i <= SDW_SCP_DEVID_5; i++)
93
93
ret += sdw_sprintf(slave, buf, ret, i);
94
+
for (i = SDW_SCP_SDCA_INT1; i <= SDW_SCP_SDCA_INTMASK4; i++)
95
+
ret += sdw_sprintf(slave, buf, ret, i);
94
96
for (i = SDW_SCP_FRAMECTRL_B0; i <= SDW_SCP_BUSCLOCK_SCALE_B0; i++)
95
97
ret += sdw_sprintf(slave, buf, ret, i);
96
98
for (i = SDW_SCP_FRAMECTRL_B1; i <= SDW_SCP_BUSCLOCK_SCALE_B1; i++)
+1
-4
drivers/soundwire/qcom.c
+1
-4
drivers/soundwire/qcom.c
···
924
924
925
925
if (msg->flags == SDW_MSG_FLAG_READ) {
926
926
for (i = 0; i < msg->len;) {
927
-
if ((msg->len - i) < QCOM_SWRM_MAX_RD_LEN)
928
-
len = msg->len - i;
929
-
else
930
-
len = QCOM_SWRM_MAX_RD_LEN;
927
+
len = min(msg->len - i, QCOM_SWRM_MAX_RD_LEN);
931
928
932
929
ret = qcom_swrm_cmd_fifo_rd_cmd(ctrl, msg->dev_num,
933
930
msg->addr + i, len,