From: Frank Schaefer Date: Sat, 13 Sep 2014 08:52:21 +0000 (-0300) Subject: [media] em28xx: get rid of field has_audio in struct em28xx_audio_mode X-Git-Tag: fixes-against-v3.18-rc2~130^2^2~79 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=920f1e4a528a1db01d6822026f653659ecb4983d;p=pandora-kernel.git [media] em28xx: get rid of field has_audio in struct em28xx_audio_mode Field has_audio in struct em28xx_audio_mode is used together with value EM28XX_NO_AC97 of field ac97 to determine the internal type of audio (none/i2s/ac97). This makes the code difficult to understand: !audio_mode.has_audio && audio_mode.ac97 == EM28XX_NO_AC97 => no audio !audio_mode.has_audio && audio_mode.ac97 != EM28XX_NO_AC97 => BUG audio_mode.has_audio && audio_mode.ac97 == EM28XX_NO_AC97 => AC97 audio audio_mode.has_audio && audio_mode.ac97 != EM28XX_NO_AC97 => I2S audio Simplify the whole thing by introducing an enum em28xx_int_audio_type which describes the internal audio type (none, ac97, i2s) and is hooked directly to the device struct. Then get rid of field has_audio in struct em28xx_audio_mode. A follow-up patch will then remove struct em28xx_ac97_mode and finally the whole struct em28xx_audio_mode. Signed-off-by: Frank Schäfer Signed-off-by: Mauro Carvalho Chehab --- Reading git-diff-tree failed