A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 13:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "soc: soundwire: update soundwire debug logs"

Browse source
This commit is contained in:
qctecmdr 2020-06-11 04:15:16 -07:00 • committed by Gerrit - the friendly Code Review server
commit a14bf0fa0a
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
soc/soundwire.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
*/
#include <linux/kernel.h>
@ -473,10 +473,6 @@ int swr_get_logical_dev_num(struct swr_device *dev, u64 dev_id,
}
mutex_lock(&master->mlock);
ret = master->get_logical_dev_num(master, dev_id, dev_num);
if (ret) {
pr_err("%s: Error %d to get logical addr for device %llx\n",
__func__, ret, dev_id);
}
mutex_unlock(&master->mlock);
return ret;
}

14
soc/swr-mstr-ctrl.c
View file

@ -1873,7 +1873,7 @@ handle_irq:
swrm_enable_slave_irq(swrm);
if (status == swrm->slave_status) {
dev_dbg(swrm->dev,
"%s: No change in slave status: %d\n",
"%s: No change in slave status: 0x%x\n",
__func__, status);
break;
}
@ -2177,17 +2177,19 @@ static int swrm_get_logical_dev_num(struct swr_master *mstr, u64 dev_id,
if ((id & SWR_DEV_ID_MASK) == dev_id) {
*dev_num = i;
ret = 0;
dev_info(swrm->dev,
"%s: devnum %d assigned for dev %llx\n",
__func__, i,
swr_dev->addr);
}
dev_dbg(swrm->dev,
"%s: devnum %d is assigned for dev addr %lx\n",
__func__, i, swr_dev->addr);
}
}
}
}
if (ret)
dev_err(swrm->dev, "%s: device 0x%llx is not ready\n",
__func__, dev_id);
dev_err_ratelimited(swrm->dev,
"%s: device 0x%llx is not ready\n",
__func__, dev_id);
pm_runtime_mark_last_busy(swrm->dev);
pm_runtime_put_autosuspend(swrm->dev);