evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] em28xx: remove some unnecessary fields from struct em28xx_audio_mode

Browse source 
Fields "ac97_feat", "ac97_vendor_id" and "i2s_samplerates" of struct
em28xx_audio_mode are used nowhere, except in function
em28xx_audio_setup(). So get rid of them and use local variables
instead.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Frank Schaefer 2014-09-13 05:52:19 -03:00 • committed by Mauro Carvalho Chehab
parent 072f1a489e
commit 60a24ba03c
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/media/usb/em28xx/em28xx-core.c
View file

@ -505,6 +505,7 @@ int em28xx_audio_setup(struct em28xx *dev)
{ {
int vid1, vid2, feat, cfg; int vid1, vid2, feat, cfg;
u32 vid; u32 vid;
u8 i2s_samplerates;
if (dev->chip_id == CHIP_ID_EM2870 || if (dev->chip_id == CHIP_ID_EM2870 ||
dev->chip_id == CHIP_ID_EM2874 || dev->chip_id == CHIP_ID_EM2874 ||
@ -534,15 +535,15 @@ int em28xx_audio_setup(struct em28xx *dev)
if (dev->chip_id < CHIP_ID_EM2860 && if (dev->chip_id < CHIP_ID_EM2860 &&
(cfg & EM28XX_CHIPCFG_AUDIOMASK) == (cfg & EM28XX_CHIPCFG_AUDIOMASK) ==
EM2820_CHIPCFG_I2S_1_SAMPRATE) EM2820_CHIPCFG_I2S_1_SAMPRATE)
dev->audio_mode.i2s_samplerates = 1; i2s_samplerates = 1;
else if (dev->chip_id >= CHIP_ID_EM2860 && else if (dev->chip_id >= CHIP_ID_EM2860 &&
(cfg & EM28XX_CHIPCFG_AUDIOMASK) == (cfg & EM28XX_CHIPCFG_AUDIOMASK) ==
EM2860_CHIPCFG_I2S_5_SAMPRATES) EM2860_CHIPCFG_I2S_5_SAMPRATES)
dev->audio_mode.i2s_samplerates = 5; i2s_samplerates = 5;
else else
dev->audio_mode.i2s_samplerates = 3; i2s_samplerates = 3;
em28xx_info("I2S Audio (%d sample rate(s))\n", em28xx_info("I2S Audio (%d sample rate(s))\n",
dev->audio_mode.i2s_samplerates); i2s_samplerates);
/* Skip the code that does AC97 vendor detection */ /* Skip the code that does AC97 vendor detection */
dev->audio_mode.ac97 = EM28XX_NO_AC97; dev->audio_mode.ac97 = EM28XX_NO_AC97;
goto init_audio; goto init_audio;
@ -569,15 +570,12 @@ int em28xx_audio_setup(struct em28xx *dev)
goto init_audio; goto init_audio;
vid = vid1 << 16 | vid2; vid = vid1 << 16 | vid2;
dev->audio_mode.ac97_vendor_id = vid;
em28xx_warn("AC97 vendor ID = 0x%08x\n", vid); em28xx_warn("AC97 vendor ID = 0x%08x\n", vid);
feat = em28xx_read_ac97(dev, AC97_RESET); feat = em28xx_read_ac97(dev, AC97_RESET);
if (feat < 0) if (feat < 0)
goto init_audio; goto init_audio;
dev->audio_mode.ac97_feat = feat;
em28xx_warn("AC97 features = 0x%04x\n", feat); em28xx_warn("AC97 features = 0x%04x\n", feat);
/* Try to identify what audio processor we have */ /* Try to identify what audio processor we have */
@ -596,8 +594,8 @@ init_audio:
em28xx_info("Empia 202 AC97 audio processor detected\n"); em28xx_info("Empia 202 AC97 audio processor detected\n");
break; break;
case EM28XX_AC97_SIGMATEL: case EM28XX_AC97_SIGMATEL:
em28xx_info("Sigmatel audio processor detected(stac 97%02x)\n", em28xx_info("Sigmatel audio processor detected (stac 97%02x)\n",
dev->audio_mode.ac97_vendor_id & 0xff); vid & 0xff);
break; break;
case EM28XX_AC97_OTHER: case EM28XX_AC97_OTHER:
em28xx_warn("Unknown AC97 audio processor detected!\n"); em28xx_warn("Unknown AC97 audio processor detected!\n");

6
drivers/media/usb/em28xx/em28xx.h
View file

@ -309,13 +309,7 @@ enum em28xx_ac97_mode {
struct em28xx_audio_mode { struct em28xx_audio_mode {
enum em28xx_ac97_mode ac97; enum em28xx_ac97_mode ac97;
u16 ac97_feat;
u32 ac97_vendor_id;
unsigned int has_audio:1; unsigned int has_audio:1;
u8 i2s_samplerates;
}; };
/* em28xx has two audio inputs: tuner and line in. /* em28xx has two audio inputs: tuner and line in.