aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/sb_ess.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2015-02-25 08:31:43 -0500
committerTakashi Iwai <tiwai@suse.de>2015-02-25 14:08:21 -0500
commite214e5183d9da3b61f775d3ae7202ea8aa10ebed (patch)
tree60a8a36e11b4b1270a8ba82930c05e313f99e9de /sound/oss/sb_ess.c
parentdf403869e35f88e1e45483d31ee70b4aa3ed8896 (diff)
sound/sb_ess: white space cleanups
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> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss/sb_ess.c')
-rw-r--r--sound/oss/sb_ess.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c
index b47a69026f1b..57f7d25a2cd3 100644
--- a/sound/oss/sb_ess.c
+++ b/sound/oss/sb_ess.c
@@ -604,7 +604,7 @@ static void ess_audio_output_block_audio2
604 ess_chgmixer (devc, 0x78, 0x03, 0x03); /* Go */ 604 ess_chgmixer (devc, 0x78, 0x03, 0x03); /* Go */
605 605
606 devc->irq_mode_16 = IMODE_OUTPUT; 606 devc->irq_mode_16 = IMODE_OUTPUT;
607 devc->intr_active_16 = 1; 607 devc->intr_active_16 = 1;
608} 608}
609 609
610static void ess_audio_output_block 610static void ess_audio_output_block
@@ -1183,17 +1183,12 @@ FKS_test (devc);
1183 chip = "ES1688"; 1183 chip = "ES1688";
1184 } 1184 }
1185 1185
1186 printk ( KERN_INFO "ESS chip %s %s%s\n" 1186 printk(KERN_INFO "ESS chip %s %s%s\n", chip,
1187 , chip 1187 (devc->sbmo.esstype == ESSTYPE_DETECT ||
1188 , ( devc->sbmo.esstype == ESSTYPE_DETECT || devc->sbmo.esstype == ESSTYPE_LIKE20 1188 devc->sbmo.esstype == ESSTYPE_LIKE20) ?
1189 ? "detected" 1189 "detected" : "specified",
1190 : "specified" 1190 devc->sbmo.esstype == ESSTYPE_LIKE20 ?
1191 ) 1191 " (kernel 2.0 compatible)" : "");
1192 , ( devc->sbmo.esstype == ESSTYPE_LIKE20
1193 ? " (kernel 2.0 compatible)"
1194 : ""
1195 )
1196 );
1197 1192
1198 sprintf(name,"ESS %s AudioDrive (rev %d)", chip, ess_minor & 0x0f); 1193 sprintf(name,"ESS %s AudioDrive (rev %d)", chip, ess_minor & 0x0f);
1199 } else { 1194 } else {