Merge "asoc: Ratelimit error logs to avoid excessive logging" (84253b6f) · Commits · e / devices / android_kernel_sony_msm8998

sound/soc/msm/qdsp6v2/msm-audio-effects-q6-v2.c

+17 −9

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2017, 2019 The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -11,6 +11,7 @@
		*/

		#include <linux/slab.h>
		#include <linux/ratelimit.h>
		#include <sound/apr_audio-v2.h>
		#include <sound/q6asm-v2.h>
		#include <sound/compress_params.h>
		@@ -23,7 +24,8 @@
		#define GET_NEXT(ptr, upper_limit, rc) \
		({ \
		if (((ptr) + 1) > (upper_limit)) { \
		pr_err("%s: param list out of boundary\n", __func__); \
		pr_err_ratelimited("%s: param list out of boundary\n", \
		__func__); \
		(rc) = -EINVAL; \
		} \
		((rc) == 0) ? *(ptr)++ : -EINVAL; \
		@@ -32,7 +34,8 @@
		#define CHECK_PARAM_LEN(len, max_len, tag, rc) \
		do { \
		if ((len) > (max_len)) { \
		pr_err("%s: params length overflows\n", (tag)); \
		pr_err_ratelimited("%s: params length overflows\n", \
		(tag)); \
		(rc) = -EINVAL; \
		} \
		} while (0)
		@@ -234,7 +237,8 @@ int msm_audio_effects_virtualizer_handler(struct audio_client *ac,
		param_data = (u8 *) &virtualizer->gain_adjust;
		break;
		default:
		pr_err("%s: Invalid command to set config\n", __func__);
		pr_err_ratelimited("%s: Invalid command to set config\n",
		__func__);
		continue;
		}
		if (rc)
		@@ -656,7 +660,8 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
		param_data = (u8 *) &reverb->density;
		break;
		default:
		pr_err("%s: Invalid command to set config\n", __func__);
		pr_err_ratelimited("%s: Invalid command to set config\n",
		__func__);
		continue;
		}
		if (rc)
		@@ -797,7 +802,8 @@ int msm_audio_effects_bass_boost_handler(struct audio_client *ac,
		param_data = (u8 *) &bass_boost->strength;
		break;
		default:
		pr_err("%s: Invalid command to set config\n", __func__);
		pr_err_ratelimited("%s: Invalid command to set config\n",
		__func__);
		continue;
		}
		if (rc)
		@@ -910,7 +916,8 @@ int msm_audio_effects_pbe_handler(struct audio_client *ac,
		param_data = (u8 *) values;
		break;
		default:
		pr_err("%s: Invalid command to set config\n", __func__);
		pr_err_ratelimited("%s: Invalid command to set config\n",
		__func__);
		continue;
		}
		if (rc)
		@@ -1151,7 +1158,8 @@ int msm_audio_effects_popless_eq_handler(struct audio_client *ac,
		param_data = (u8 *) &eq->freq_millihertz;
		break;
		default:
		pr_err("%s: Invalid command to set config\n", __func__);
		pr_err_ratelimited("%s: Invalid command to set config\n",
		__func__);
		continue;
		}
		if (rc)
		@@ -1270,7 +1278,7 @@ static int __msm_audio_effects_volume_handler(struct audio_client *ac,
		"VOLUME/VOLUME2_GAIN_MASTER", rc);
		break;
		default:
		pr_err("%s: Invalid command id: %d to set config\n",
		pr_err_ratelimited("%s: Invalid command id: %d to set config\n",
		__func__, command_id);
		continue;
		}