iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/omap' into asoc-next

Browse Source
This commit is contained in:
Mark Brown 2014-03-23 14:00:55 +00:00
commit 980aac2087
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/codecs/max98090.c
View File

@ -2343,7 +2343,6 @@ static int max98090_i2c_probe(struct i2c_client *i2c,
max98090->devtype = id->driver_data; max98090->devtype = id->driver_data;
i2c_set_clientdata(i2c, max98090); i2c_set_clientdata(i2c, max98090);
max98090->control_data = i2c;
max98090->pdata = i2c->dev.platform_data; max98090->pdata = i2c->dev.platform_data;
max98090->irq = i2c->irq; max98090->irq = i2c->irq;

1
sound/soc/codecs/max98090.h
View File

@ -1523,7 +1523,6 @@ struct max98090_priv {
struct regmap *regmap; struct regmap *regmap;
struct snd_soc_codec *codec; struct snd_soc_codec *codec;
enum max98090_type devtype; enum max98090_type devtype;
void *control_data;
struct max98090_pdata *pdata; struct max98090_pdata *pdata;
unsigned int sysclk; unsigned int sysclk;
unsigned int bclk; unsigned int bclk;

3
sound/soc/omap/omap-abe-twl6040.c
View File

@ -203,8 +203,7 @@ static const struct snd_soc_dapm_route dmic_audio_map[] = {
static int omap_abe_dmic_init(struct snd_soc_pcm_runtime *rtd) static int omap_abe_dmic_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_codec *codec = rtd->codec; struct snd_soc_dapm_context *dapm = &rtd->card->dapm;
struct snd_soc_dapm_context *dapm = &codec->dapm;
return snd_soc_dapm_add_routes(dapm, dmic_audio_map, return snd_soc_dapm_add_routes(dapm, dmic_audio_map,
ARRAY_SIZE(dmic_audio_map)); ARRAY_SIZE(dmic_audio_map));