summaryrefslogtreecommitdiffstats
path: root/drivers/staging/greybus/audio_module.c
diff options
context:
space:
mode:
authorVaibhav Agarwal2016-06-10 09:29:11 +0200
committerGreg Kroah-Hartman2016-06-10 20:46:06 +0200
commitc6722ab5d3c3d23021dd32bd1ae569665ee2263b (patch)
tree128e7dea9e6302599894a8e4f6e570401fb28037 /drivers/staging/greybus/audio_module.c
parentgreybus: Remove apbridgea_shutdown_xx sequence if already done (diff)
downloadkernel-qcow2-linux-c6722ab5d3c3d23021dd32bd1ae569665ee2263b.tar.gz
kernel-qcow2-linux-c6722ab5d3c3d23021dd32bd1ae569665ee2263b.tar.xz
kernel-qcow2-linux-c6722ab5d3c3d23021dd32bd1ae569665ee2263b.zip
greybus: audio: Ratelimit err messages in bundle, topology driver
Earlier I have shared a patch to rate limit err messages in audio_codec driver. However, missed to include suggestion from Mark to do similar changes in audio bundle & topology parser as well. Doing it now. Testing Done: Compile tested Fixes: 4cb3d109e5fc ("audio: Ratelimit err messages") Signed-off-by: Vaibhav Agarwal <vaibhav.agarwal@linaro.org> Reviewed-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/audio_module.c')
-rw-r--r--drivers/staging/greybus/audio_module.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/drivers/staging/greybus/audio_module.c b/drivers/staging/greybus/audio_module.c
index 95d2ddadeeab..81001329aad2 100644
--- a/drivers/staging/greybus/audio_module.c
+++ b/drivers/staging/greybus/audio_module.c
@@ -23,8 +23,9 @@ static int gbaudio_request_jack(struct gbaudio_module_info *module,
{
int report, button_status;
- dev_warn(module->dev, "Jack Event received: type: %u, event: %u\n",
- req->jack_attribute, req->event);
+ dev_warn_ratelimited(module->dev,
+ "Jack Event received: type: %u, event: %u\n",
+ req->jack_attribute, req->event);
if (req->event == GB_AUDIO_JACK_EVENT_REMOVAL) {
module->jack_type = 0;
@@ -42,8 +43,9 @@ static int gbaudio_request_jack(struct gbaudio_module_info *module,
report &= ~GBCODEC_JACK_MASK;
report |= req->jack_attribute & GBCODEC_JACK_MASK;
if (module->jack_type)
- dev_warn(module->dev, "Modifying jack from %d to %d\n",
- module->jack_type, report);
+ dev_warn_ratelimited(module->dev,
+ "Modifying jack from %d to %d\n",
+ module->jack_type, report);
module->jack_type = report;
snd_soc_jack_report(&module->headset_jack, report, GBCODEC_JACK_MASK);
@@ -56,12 +58,14 @@ static int gbaudio_request_button(struct gbaudio_module_info *module,
{
int soc_button_id, report;
- dev_warn(module->dev, "Button Event received: id: %u, event: %u\n",
- req->button_id, req->event);
+ dev_warn_ratelimited(module->dev,
+ "Button Event received: id: %u, event: %u\n",
+ req->button_id, req->event);
/* currently supports 4 buttons only */
if (!module->jack_type) {
- dev_err(module->dev, "Jack not present. Bogus event!!\n");
+ dev_err_ratelimited(module->dev,
+ "Jack not present. Bogus event!!\n");
return -EINVAL;
}
@@ -84,7 +88,8 @@ static int gbaudio_request_button(struct gbaudio_module_info *module,
soc_button_id = SND_JACK_BTN_3;
break;
default:
- dev_err(module->dev, "Invalid button request received\n");
+ dev_err_ratelimited(module->dev,
+ "Invalid button request received\n");
return -EINVAL;
}
@@ -138,8 +143,8 @@ static int gbaudio_codec_request_handler(struct gb_operation *op)
break;
default:
- dev_err(&connection->bundle->dev,
- "Invalid Audio Event received\n");
+ dev_err_ratelimited(&connection->bundle->dev,
+ "Invalid Audio Event received\n");
return -EINVAL;
}