jsauer/torvalds-linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-11 17:10:13 +00:00
Code

soundwire updates for 6.18

Browse Source 
A very small update this time
  - add few registers to debugfs
  - core: drop dev_pm_domain_detach() call and min() to improve code
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE+vs47OPLdNbVcHzyfBQHDyUjg0cFAmjjZBMACgkQfBQHDyUj
 g0fRSQ//RdFbC1ly+/Tf6GfYb3X/wwTA4889SvVKpXuTZ9Hj3DejX3N4FIFGoolq
 upOVhYtDUvrNitU4ik0SdUJCYW1G7Q0rHUsWYh1CAcUYocwZ0pFN2PBvgyPb4XP1
 faLp4DN6/kKD5hTeUd547PbsjSxnouu3xn52fEGmbpMVf/gPo0yQib4SkB6G+aS4
 cOmd7g5jmbarcaRBhAUMpj1qM57vDbk30oll2kOZpNFI4+f4EcfJ1XC4e6XG6XJ0
 knfCC/hF1WI4uWcRIzF/38xY3owftiU2OGoFh09BF/Xhs3txlETPCKsrvL79NAwl
 zqXpW43nHDoUooH7Mk9QUWr86pq9L0O7IvMpTwmMWJ/evaH5J1EtdCFyqgT5oNMu
 Gq+oFcLz+r0wvRWDiZN70cEjWdyQceEQqOHiMCm2xhMbo6keBKuQgJsfeSOPjBp/
 +IopJDIBtl0IhopZF0amZ0konP7YVom99QZ89CpTpZ/k0yLdFi90gisaRdT/mV4a
 LI52P1t/Hi00UJqcwa6KA+ByE9XFAr7PmDsrc2ueSKXQiAZvl97CK4xQ25LfJG7N
 cHO0gI0/E0rCg/VROZc7HFR+LRz8W6taK0Su4UbafPhFYk8ynXezc1gx0ceaVb9W
 4MgQHnczVBnVmEn1J8RBAgLfsCsthIS1riuqS3L4hw61+HYPwlY=
 =6U1U
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2025-10-06 10:32:22 -07:00
commit 58b65f6dcc
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/soundwire/bus_type.c
View File

@ -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;

2
drivers/soundwire/debugfs.c
View File

@ -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++)

5
drivers/soundwire/qcom.c
View File

@ -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,