From: Michael Krufky Date: Thu, 13 Apr 2006 16:06:28 +0000 (-0300) Subject: V4L/DVB (3801): Cx88-tvaudio: replace 'if' with 'switch..case' X-Git-Tag: MMI-PSA29.97-13-9~49232^2~218 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7a3165a1520c608f10a66588ab48275e1ce253f5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git V4L/DVB (3801): Cx88-tvaudio: replace 'if' with 'switch..case' This patch cleans up a potential mess that has yet to occur in the card-specific part of cx88-tvaudio.c that sets sound input from external adc. It may be a good idea to move this setting into cx88-cards.c in the future. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c index 3d3376d590a5..210f9f7ebed4 100644 --- a/drivers/media/video/cx88/cx88-tvaudio.c +++ b/drivers/media/video/cx88/cx88-tvaudio.c @@ -148,11 +148,14 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) if (cx88_boards[core->board].blackbird) { /* sets sound input from external adc */ - if ((core->board == CX88_BOARD_HAUPPAUGE_ROSLYN)|| - (core->board == CX88_BOARD_KWORLD_MCE200_DELUXE)) + switch (core->board) { + case CX88_BOARD_HAUPPAUGE_ROSLYN: + case CX88_BOARD_KWORLD_MCE200_DELUXE: cx_clear(AUD_CTL, EN_I2SIN_ENABLE); - else + break; + default: cx_set(AUD_CTL, EN_I2SIN_ENABLE); + } cx_write(AUD_I2SINPUTCNTL, 4); cx_write(AUD_BAUDRATE, 1);