[PATCH] sound/usb/mixer.c: fix dmesg source grepability

[PATCH] sound/usb/mixer.c: fix dmesg source grepability

[Michał Mirosław]

This fixes messages from commit 80acefff3bc7bd53d46c16c683ab66c0ece20810.

Signed-off-by: Michał Miroslaw <mirq-linux@rere.qmqm.pl>

---
 sound/usb/mixer.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index d40a285..a278b82 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -1305,13 +1305,13 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
 	 * devices. It will definitively catch all buggy Logitech devices.
 	 */
 	if (range > 384) {
-		usb_audio_warn(state->chip, "Warning! Unlikely big "
-			   "volume range (=%u), cval->res is probably wrong.",
-			   range);
-		usb_audio_warn(state->chip, "[%d] FU [%s] ch = %d, "
-			   "val = %d/%d/%d", cval->id,
-			   kctl->id.name, cval->channels,
-			   cval->min, cval->max, cval->res);
+		usb_audio_warn(state->chip,
+			       "Warning! Unlikely big volume range (=%u), cval->res is probably wrong.",
+			       range);
+		usb_audio_warn(state->chip,
+			       "[%d] FU [%s] ch = %d, val = %d/%d/%d",
+			       cval->id, kctl->id.name, cval->channels,
+			       cval->min, cval->max, cval->res);
 	}
 
 	usb_audio_dbg(state->chip, "[%d] FU [%s] ch = %d, val = %d/%d/%d\n",
-- 
2.0.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] sound/usb/mixer.c: fix dmesg source grepability

[Takashi Iwai]

At Sun, 20 Jul 2014 16:05:25 +0200 (CEST),
Michał Mirosław wrote:
> 
> This fixes messages from commit 80acefff3bc7bd53d46c16c683ab66c0ece20810.

Well, this doesn't "fix".  The original code is suboptimal regarding
the grepability, but it's different from "broken".

In anyway, the patch isn't cleanly applicable.  The changes look good,
so please resubmit the applicable patch with rephrased subject /
changelog.


thanks,

Takashi

> 
> Signed-off-by: Michał Miroslaw <mirq-linux@rere.qmqm.pl>
> 
> ---
>  sound/usb/mixer.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
> index d40a285..a278b82 100644
> --- a/sound/usb/mixer.c
> +++ b/sound/usb/mixer.c
> @@ -1305,13 +1305,13 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
>  	 * devices. It will definitively catch all buggy Logitech devices.
>  	 */
>  	if (range > 384) {
> -		usb_audio_warn(state->chip, "Warning! Unlikely big "
> -			   "volume range (=%u), cval->res is probably wrong.",
> -			   range);
> -		usb_audio_warn(state->chip, "[%d] FU [%s] ch = %d, "
> -			   "val = %d/%d/%d", cval->id,
> -			   kctl->id.name, cval->channels,
> -			   cval->min, cval->max, cval->res);
> +		usb_audio_warn(state->chip,
> +			       "Warning! Unlikely big volume range (=%u), cval->res is probably wrong.",
> +			       range);
> +		usb_audio_warn(state->chip,
> +			       "[%d] FU [%s] ch = %d, val = %d/%d/%d",
> +			       cval->id, kctl->id.name, cval->channels,
> +			       cval->min, cval->max, cval->res);
>  	}
>  
>  	usb_audio_dbg(state->chip, "[%d] FU [%s] ch = %d, val = %d/%d/%d\n",
> -- 
> 2.0.1
> 
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

[ALSA] sound/usb/mixer.c: improve dmesg source grepability

[Michał Mirosław]

This improves messages from commit 80acefff3bc7bd53d46c16c683ab66c0ece20810.

Signed-off-by: Michał Miroslaw <mirq-linux@rere.qmqm.pl>
Cc: Alexey Fisher <bug-track@fisher-privat.net>
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 sound/usb/mixer.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

patch against current Linus's tree.

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 0b728d8..2e4a9db 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -1340,12 +1340,11 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
 	 */
 	if (range > 384) {
 		usb_audio_warn(state->chip,
-			       "Warning! Unlikely big volume range (=%u), "
-			       "cval->res is probably wrong.",
+			       "Warning! Unlikely big volume range (=%u), cval->res is probably wrong.",
 			       range);
-		usb_audio_warn(state->chip, "[%d] FU [%s] ch = %d, "
-			       "val = %d/%d/%d", cval->id,
-			       kctl->id.name, cval->channels,
+		usb_audio_warn(state->chip,
+			       "[%d] FU [%s] ch = %d, val = %d/%d/%d",
+			       cval->id, kctl->id.name, cval->channels,
 			       cval->min, cval->max, cval->res);
 	}
 
-- 
2.0.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel