diff mbox

sound/sb_ess: white space cleanups

Message ID 20150225133143.GP19745@mwanda (mailing list archive)
State Accepted
Commit e214e5183d9da3b61f775d3ae7202ea8aa10ebed
Headers show

Commit Message

Dan Carpenter Feb. 25, 2015, 1:31 p.m. UTC 
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>

Comments

Takashi Iwai Feb. 25, 2015, 7:09 p.m. UTC | #1 
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 {
>
diff mbox

Patch

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 {