Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6722ab5 authored by Vaibhav Agarwal's avatar Vaibhav Agarwal Committed by Greg Kroah-Hartman
Browse files

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: default avatarVaibhav Agarwal <vaibhav.agarwal@linaro.org>
Reviewed-by: default avatarVaibhav Hiremath <vaibhav.hiremath@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent f2b6303d

drivers/staging/greybus/audio_module.c

+15 −10
Original line number Original line Diff line number Diff line
@@ -23,7 +23,8 @@ static int gbaudio_request_jack(struct gbaudio_module_info *module, 
{

{

	int report, button_status;

	int report, button_status;





	dev_warn(module->dev, "Jack Event received: type: %u, event: %u\n",

	dev_warn_ratelimited(module->dev,

			     "Jack Event received: type: %u, event: %u\n",

			     req->jack_attribute, req->event);

			     req->jack_attribute, req->event);





	if (req->event == GB_AUDIO_JACK_EVENT_REMOVAL) {

	if (req->event == GB_AUDIO_JACK_EVENT_REMOVAL) {
@@ -42,7 +43,8 @@ static int gbaudio_request_jack(struct gbaudio_module_info *module, 
	report &= ~GBCODEC_JACK_MASK;

	report &= ~GBCODEC_JACK_MASK;

	report |= req->jack_attribute & GBCODEC_JACK_MASK;

	report |= req->jack_attribute & GBCODEC_JACK_MASK;

	if (module->jack_type)

	if (module->jack_type)

		dev_warn(module->dev, "Modifying jack from %d to %d\n",

		dev_warn_ratelimited(module->dev,

				     "Modifying jack from %d to %d\n",

				     module->jack_type, report);

				     module->jack_type, report);





	module->jack_type = report;

	module->jack_type = report;
@@ -56,12 +58,14 @@ static int gbaudio_request_button(struct gbaudio_module_info *module, 
{

{

	int soc_button_id, report;

	int soc_button_id, report;





	dev_warn(module->dev, "Button Event received: id: %u, event: %u\n",

	dev_warn_ratelimited(module->dev,

			     "Button Event received: id: %u, event: %u\n",

			     req->button_id, req->event);

			     req->button_id, req->event);





	/* currently supports 4 buttons only */

	/* currently supports 4 buttons only */

	if (!module->jack_type) {

	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;

		return -EINVAL;

	}

	}
@@ -84,7 +88,8 @@ static int gbaudio_request_button(struct gbaudio_module_info *module, 
		soc_button_id = SND_JACK_BTN_3;

		soc_button_id = SND_JACK_BTN_3;

		break;

		break;

	default:

	default:

		dev_err(module->dev, "Invalid button request received\n");

		dev_err_ratelimited(module->dev,

				    "Invalid button request received\n");

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -138,7 +143,7 @@ static int gbaudio_codec_request_handler(struct gb_operation *op) 
		break;

		break;





	default:

	default:

		dev_err(&connection->bundle->dev,

		dev_err_ratelimited(&connection->bundle->dev,

				    "Invalid Audio Event received\n");

				    "Invalid Audio Event received\n");

		return -EINVAL;

		return -EINVAL;

	}

	}

drivers/staging/greybus/audio_topology.c

+12 −11
Original line number Original line Diff line number Diff line
@@ -173,8 +173,8 @@ static int gbcodec_mixer_ctl_get(struct snd_kcontrol *kcontrol, 
	ret = gb_audio_gb_get_control(module->mgmt_connection, data->ctl_id,

	ret = gb_audio_gb_get_control(module->mgmt_connection, data->ctl_id,

				      GB_AUDIO_INVALID_INDEX, &gbvalue);

				      GB_AUDIO_INVALID_INDEX, &gbvalue);

	if (ret) {

	if (ret) {

		dev_err(codec->dev, "%d:Error in %s for %s\n", ret, __func__,

		dev_err_ratelimited(codec->dev, "%d:Error in %s for %s\n", ret,

			kcontrol->id.name);

				    __func__, kcontrol->id.name);

		return ret;

		return ret;

	}

	}
@@ -253,8 +253,8 @@ static int gbcodec_mixer_ctl_put(struct snd_kcontrol *kcontrol, 
	ret = gb_audio_gb_set_control(module->mgmt_connection, data->ctl_id,

	ret = gb_audio_gb_set_control(module->mgmt_connection, data->ctl_id,

				      GB_AUDIO_INVALID_INDEX, &gbvalue);

				      GB_AUDIO_INVALID_INDEX, &gbvalue);

	if (ret) {

	if (ret) {

		dev_err(codec->dev, "%d:Error in %s for %s\n", ret, __func__,

		dev_err_ratelimited(codec->dev, "%d:Error in %s for %s\n", ret,

			kcontrol->id.name);

				    __func__, kcontrol->id.name);

	}

	}





	return ret;

	return ret;
@@ -335,8 +335,8 @@ static int gbcodec_mixer_dapm_ctl_get(struct snd_kcontrol *kcontrol, 
	ret = gb_audio_gb_get_control(module->mgmt_connection, data->ctl_id,

	ret = gb_audio_gb_get_control(module->mgmt_connection, data->ctl_id,

				      GB_AUDIO_INVALID_INDEX, &gbvalue);

				      GB_AUDIO_INVALID_INDEX, &gbvalue);

	if (ret) {

	if (ret) {

		dev_err(codec->dev, "%d:Error in %s for %s\n", ret, __func__,

		dev_err_ratelimited(codec->dev, "%d:Error in %s for %s\n", ret,

			kcontrol->id.name);

				    __func__, kcontrol->id.name);

		return ret;

		return ret;

	}

	}

	/* update ucontrol */

	/* update ucontrol */
@@ -393,9 +393,9 @@ static int gbcodec_mixer_dapm_ctl_put(struct snd_kcontrol *kcontrol, 
					      data->ctl_id,

					      data->ctl_id,

					      GB_AUDIO_INVALID_INDEX, &gbvalue);

					      GB_AUDIO_INVALID_INDEX, &gbvalue);

		if (ret) {

		if (ret) {

			dev_err(codec->dev,

			dev_err_ratelimited(codec->dev,

				"%d:Error in %s for %s\n", ret, __func__,

					    "%d:Error in %s for %s\n", ret,

				kcontrol->id.name);

					    __func__, kcontrol->id.name);

		}

		}

	}

	}
@@ -600,7 +600,8 @@ static int gbaudio_widget_event(struct snd_soc_dapm_widget *w, 
		break;

		break;

	}

	}

	if (ret)

	if (ret)

		dev_err(codec->dev, "%d: widget, event:%d failed:%d\n", wid,

		dev_err_ratelimited(codec->dev,

				    "%d: widget, event:%d failed:%d\n", wid,

				    event, ret);

				    event, ret);

	return ret;

	return ret;

}

}