Skip to content

Commit

Permalink
ASoC: ak4642: cleanup struct ak4642_priv
Browse files Browse the repository at this point in the history
This patch removed struct ak4642_priv which had
meaningless variable.
It is no longer needed

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Nov 21, 2012
1 parent f4a75d2 commit 2f39125
Showing 1 changed file with 2 additions and 21 deletions.
23 changes: 2 additions & 21 deletions sound/soc/codecs/ak4642.c
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,6 @@ static const struct snd_soc_dapm_route ak4642_intercon[] = {
{"LINEOUT Mixer", "DACL", "DAC"},
};

/* codec private data */
struct ak4642_priv {
unsigned int sysclk;
enum snd_soc_control_type control_type;
};

/*
* ak4642 register cache
*/
Expand Down Expand Up @@ -468,10 +462,9 @@ static int ak4642_resume(struct snd_soc_codec *codec)

static int ak4642_probe(struct snd_soc_codec *codec)
{
struct ak4642_priv *ak4642 = snd_soc_codec_get_drvdata(codec);
int ret;

ret = snd_soc_codec_set_cache_io(codec, 8, 8, ak4642->control_type);
ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_I2C);
if (ret < 0) {
dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
return ret;
Expand Down Expand Up @@ -523,21 +516,9 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4648 = {
static __devinit int ak4642_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct ak4642_priv *ak4642;
int ret;

ak4642 = devm_kzalloc(&i2c->dev, sizeof(struct ak4642_priv),
GFP_KERNEL);
if (!ak4642)
return -ENOMEM;

i2c_set_clientdata(i2c, ak4642);
ak4642->control_type = SND_SOC_I2C;

ret = snd_soc_register_codec(&i2c->dev,
return snd_soc_register_codec(&i2c->dev,
(struct snd_soc_codec_driver *)id->driver_data,
&ak4642_dai, 1);
return ret;
}

static __devexit int ak4642_i2c_remove(struct i2c_client *client)
Expand Down

0 comments on commit 2f39125

Please sign in to comment.