* [patch] sound/sb_ess: white space cleanups
@ 2015-02-25 13:31 Dan Carpenter
2015-02-25 19:09 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2015-02-25 13:31 UTC (permalink / raw)
To: Jaroslav Kysela; +Cc: Takashi Iwai, alsa-devel, kernel-janitors
These weren't aligned on the same lines as the surrounding code and the
printk was quite messy.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c
index b47a690..57f7d25 100644
--- a/sound/oss/sb_ess.c
+++ b/sound/oss/sb_ess.c
@@ -604,7 +604,7 @@ static void ess_audio_output_block_audio2
ess_chgmixer (devc, 0x78, 0x03, 0x03); /* Go */
devc->irq_mode_16 = IMODE_OUTPUT;
- devc->intr_active_16 = 1;
+ devc->intr_active_16 = 1;
}
static void ess_audio_output_block
@@ -1183,17 +1183,12 @@ FKS_test (devc);
chip = "ES1688";
}
- printk ( KERN_INFO "ESS chip %s %s%s\n"
- , chip
- , ( devc->sbmo.esstype = ESSTYPE_DETECT || devc->sbmo.esstype = ESSTYPE_LIKE20
- ? "detected"
- : "specified"
- )
- , ( devc->sbmo.esstype = ESSTYPE_LIKE20
- ? " (kernel 2.0 compatible)"
- : ""
- )
- );
+ printk(KERN_INFO "ESS chip %s %s%s\n", chip,
+ (devc->sbmo.esstype = ESSTYPE_DETECT ||
+ devc->sbmo.esstype = ESSTYPE_LIKE20) ?
+ "detected" : "specified",
+ devc->sbmo.esstype = ESSTYPE_LIKE20 ?
+ " (kernel 2.0 compatible)" : "");
sprintf(name,"ESS %s AudioDrive (rev %d)", chip, ess_minor & 0x0f);
} else {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] sound/sb_ess: white space cleanups
2015-02-25 13:31 [patch] sound/sb_ess: white space cleanups Dan Carpenter
@ 2015-02-25 19:09 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2015-02-25 19:09 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Jaroslav Kysela, alsa-devel, kernel-janitors
At Wed, 25 Feb 2015 16:31:43 +0300,
Dan Carpenter wrote:
>
> These weren't aligned on the same lines as the surrounding code and the
> printk was quite messy.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied, thanks.
Takashi
>
> diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c
> index b47a690..57f7d25 100644
> --- a/sound/oss/sb_ess.c
> +++ b/sound/oss/sb_ess.c
> @@ -604,7 +604,7 @@ static void ess_audio_output_block_audio2
> ess_chgmixer (devc, 0x78, 0x03, 0x03); /* Go */
>
> devc->irq_mode_16 = IMODE_OUTPUT;
> - devc->intr_active_16 = 1;
> + devc->intr_active_16 = 1;
> }
>
> static void ess_audio_output_block
> @@ -1183,17 +1183,12 @@ FKS_test (devc);
> chip = "ES1688";
> }
>
> - printk ( KERN_INFO "ESS chip %s %s%s\n"
> - , chip
> - , ( devc->sbmo.esstype = ESSTYPE_DETECT || devc->sbmo.esstype = ESSTYPE_LIKE20
> - ? "detected"
> - : "specified"
> - )
> - , ( devc->sbmo.esstype = ESSTYPE_LIKE20
> - ? " (kernel 2.0 compatible)"
> - : ""
> - )
> - );
> + printk(KERN_INFO "ESS chip %s %s%s\n", chip,
> + (devc->sbmo.esstype = ESSTYPE_DETECT ||
> + devc->sbmo.esstype = ESSTYPE_LIKE20) ?
> + "detected" : "specified",
> + devc->sbmo.esstype = ESSTYPE_LIKE20 ?
> + " (kernel 2.0 compatible)" : "");
>
> sprintf(name,"ESS %s AudioDrive (rev %d)", chip, ess_minor & 0x0f);
> } else {
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-25 19:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-25 13:31 [patch] sound/sb_ess: white space cleanups Dan Carpenter
2015-02-25 19:09 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox