Merge "rpmsg: glink: Change error logging to avoid throttling" (c3a5f5cf) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/rpmsg/qcom_glink_native.c

+4 −3

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Copyright (c) 2016-2017, Linaro Ltd
		* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
		*/

		#include <linux/idr.h>
		@@ -52,7 +52,8 @@ do { \
		if (ch->glink) { \
		ipc_log_string(ch->glink->ilc, "%s[%d:%d] %s: "x, ch->name, \
		ch->lcid, ch->rcid, __func__, ##__VA_ARGS__); \
		dev_err(ch->glink->dev, "[%s]: "x, __func__, ##__VA_ARGS__); \
		dev_err_ratelimited(ch->glink->dev, "[%s]: "x, __func__, \
		##__VA_ARGS__); \
		} \
		} while (0)

		@@ -1062,7 +1063,7 @@ static int qcom_glink_rx_data(struct qcom_glink *glink, size_t avail)
		channel->ept.priv,
		RPMSG_ADDR_ANY);

		if (ret < 0) {
		if (ret < 0 && ret != -ENODEV) {
		CH_ERR(channel,
		"callback error ret = %d\n", ret);
		ret = 0;