Skip to content

Commit

Permalink
[ALSA] soc - wm8731 - Clean up checkpatch warnings
Browse files Browse the repository at this point in the history 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Mark Brown authored and Takashi Iwai committed Apr 24, 2008
1 parent b32432e commit d454aee
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions sound/soc/codecs/wm8731.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ static int wm8731_write(struct snd_soc_codec *codec, unsigned int reg,
data[0] = (reg << 1) | ((value >> 8) & 0x0001);
data[1] = value & 0x00ff;

wm8731_write_reg_cache (codec, reg, value);
wm8731_write_reg_cache(codec, reg, value);
if (codec->hw_write(codec->control_data, data, 2) == 2)
return 0;
else
Expand Down Expand Up @@ -154,8 +154,10 @@ static int wm8731_add_controls(struct snd_soc_codec *codec)
int err, i;

for (i = 0; i < ARRAY_SIZE(wm8731_snd_controls); i++) {
if ((err = snd_ctl_add(codec->card,
snd_soc_cnew(&wm8731_snd_controls[i],codec, NULL))) < 0)
err = snd_ctl_add(codec->card,
snd_soc_cnew(&wm8731_snd_controls[i],
codec, NULL));
if (err < 0)
return err;
}

Expand Down Expand Up @@ -221,15 +223,13 @@ static int wm8731_add_widgets(struct snd_soc_codec *codec)
{
int i;

for(i = 0; i < ARRAY_SIZE(wm8731_dapm_widgets); i++) {
for (i = 0; i < ARRAY_SIZE(wm8731_dapm_widgets); i++)
snd_soc_dapm_new_control(codec, &wm8731_dapm_widgets[i]);
}

/* set up audio path interconnects */
for(i = 0; intercon[i][0] != NULL; i++) {
for (i = 0; intercon[i][0] != NULL; i++)
snd_soc_dapm_connect_input(codec, intercon[i][0],
intercon[i][1], intercon[i][2]);
}

snd_soc_dapm_new_widgets(codec);
return 0;
Expand Down Expand Up @@ -589,7 +589,7 @@ static int wm8731_init(struct snd_soc_device *socdev)

static struct snd_soc_device *wm8731_socdev;

#if defined (CONFIG_I2C) || defined (CONFIG_I2C_MODULE)
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)

/*
* WM8731 2 wire address is determined by GPIO5
Expand Down Expand Up @@ -651,7 +651,7 @@ static int wm8731_codec_probe(struct i2c_adapter *adap, int addr, int kind)

static int wm8731_i2c_detach(struct i2c_client *client)
{
struct snd_soc_codec* codec = i2c_get_clientdata(client);
struct snd_soc_codec *codec = i2c_get_clientdata(client);
i2c_detach_client(client);
kfree(codec->reg_cache);
kfree(client);
Expand Down Expand Up @@ -709,7 +709,7 @@ static int wm8731_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&codec->dapm_paths);

wm8731_socdev = socdev;
#if defined (CONFIG_I2C) || defined (CONFIG_I2C_MODULE)
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
if (setup->i2c_address) {
normal_i2c[0] = setup->i2c_address;
codec->hw_write = (hw_write_t)i2c_master_send;
Expand All @@ -734,7 +734,7 @@ static int wm8731_remove(struct platform_device *pdev)

snd_soc_free_pcms(socdev);
snd_soc_dapm_free(socdev);
#if defined (CONFIG_I2C) || defined (CONFIG_I2C_MODULE)
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
i2c_del_driver(&wm8731_i2c_driver);
#endif
kfree(codec->private_data);
Expand All @@ -749,7 +749,6 @@ struct snd_soc_codec_device soc_codec_dev_wm8731 = {
.suspend = wm8731_suspend,
.resume = wm8731_resume,
};

EXPORT_SYMBOL_GPL(soc_codec_dev_wm8731);

MODULE_DESCRIPTION("ASoC WM8731 driver");
Expand Down

0 comments on commit d454aee

Please sign in to comment.