Merge "soc: soundwire: update soundwire debug logs" (a14bf0fa) · Commits · e / devices / android_kernel_fairphone_FP5

soc/soundwire.c

+1 −5

Original line number	Diff line number	Diff line
		// 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;
		}

+8 −6

Original line number	Diff line number	Diff line
		@@ -1873,7 +1873,7 @@ static irqreturn_t swr_mstr_interrupt(int irq, void *dev)
		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,16 +2177,18 @@ 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",
		dev_err_ratelimited(swrm->dev,
		"%s: device 0x%llx is not ready\n",
		__func__, dev_id);

		pm_runtime_mark_last_busy(swrm->dev);