Merge "asoc: msm: routing: remove WARN() log messages"

This commit is contained in:
Linux Build Service Account 2018-10-16 20:46:44 -07:00 • committed by Gerrit - the friendly Code Review server
commit 4384fe6966

View file

@ -2704,7 +2704,8 @@ static int msm_routing_lsm_func_get(struct snd_kcontrol *kcontrol,
break;
if (i-- == ARRAY_SIZE(lsm_port_text)) {
WARN(1, "Invalid id name %s\n", kcontrol->id.name);
pr_warn("%s: Invalid id name %s\n", __func__,
kcontrol->id.name);
return -EINVAL;
}
@ -2751,7 +2752,7 @@ static int msm_routing_lsm_func_get(struct snd_kcontrol *kcontrol,
ucontrol->value.integer.value[0] = MADSWAUDIO;
break;
default:
WARN(1, "Unknown\n");
pr_warn("%s: Unknown\n", __func__);
return -EINVAL;
}
return 0;
@ -2771,7 +2772,8 @@ static int msm_routing_lsm_func_put(struct snd_kcontrol *kcontrol,
break;
if (i-- == ARRAY_SIZE(lsm_port_text)) {
WARN(1, "Invalid id name %s\n", kcontrol->id.name);
pr_warn("%s: Invalid id name %s\n", __func__,
kcontrol->id.name);
return -EINVAL;
}
@ -2793,7 +2795,7 @@ static int msm_routing_lsm_func_put(struct snd_kcontrol *kcontrol,
mad_type = MAD_SW_AUDIO;
break;
default:
WARN(1, "Unknown\n");
pr_warn("%s: Unknown\n", __func__);
return -EINVAL;
}