AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ALSA: ASoC: WM8903 I2C cleanups

Browse Source 
Fix a few issues identified by Jean Delvare:

 - Add missing newline to error display.
 - Return an error when we fail to locate the I2C adaptor.
 - Remove the static wm8903_i2c_device Jean suggested, it's redundant.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Mark Brown 2008-08-26 15:29:11 +01:00 committed by Jaroslav Kysela
parent 9b6e12e458
commit acdfc9e305
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/codecs/wm8903.c
View File

@ -1706,8 +1706,6 @@ static struct i2c_driver wm8903_i2c_driver = {
.id_table = wm8903_i2c_id, .id_table = wm8903_i2c_id,
}; };
static struct i2c_client *wm8903_i2c_device;
static int wm8903_probe(struct platform_device *pdev) static int wm8903_probe(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
@ -1716,6 +1714,7 @@ static int wm8903_probe(struct platform_device *pdev)
struct wm8903_priv *wm8903; struct wm8903_priv *wm8903;
struct i2c_board_info board_info; struct i2c_board_info board_info;
struct i2c_adapter *adapter; struct i2c_adapter *adapter;
struct i2c_client *i2c_client;
int ret = 0; int ret = 0;
setup = socdev->codec_data; setup = socdev->codec_data;
@ -1746,7 +1745,7 @@ static int wm8903_probe(struct platform_device *pdev)
codec->hw_write = (hw_write_t)i2c_master_send; codec->hw_write = (hw_write_t)i2c_master_send;
ret = i2c_add_driver(&wm8903_i2c_driver); ret = i2c_add_driver(&wm8903_i2c_driver);
if (ret != 0) { if (ret != 0) {
dev_err(&pdev->dev, "can't add i2c driver"); dev_err(&pdev->dev, "can't add i2c driver\n");
goto err_priv; goto err_priv;
} else { } else {
memset(&board_info, 0, sizeof(board_info)); memset(&board_info, 0, sizeof(board_info));
@ -1757,12 +1756,13 @@ static int wm8903_probe(struct platform_device *pdev)
if (!adapter) { if (!adapter) {
dev_err(&pdev->dev, "Can't get I2C bus %d\n", dev_err(&pdev->dev, "Can't get I2C bus %d\n",
setup->i2c_bus); setup->i2c_bus);
ret = -ENODEV;
goto err_adapter; goto err_adapter;
} }
wm8903_i2c_device = i2c_new_device(adapter, &board_info); i2c_client = i2c_new_device(adapter, &board_info);
i2c_put_adapter(adapter); i2c_put_adapter(adapter);
if (wm8903_i2c_device == NULL) { if (i2c_client == NULL) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"I2C driver registration failed\n"); "I2C driver registration failed\n");
ret = -ENODEV; ret = -ENODEV;
@ -1792,7 +1792,7 @@ static int wm8903_remove(struct platform_device *pdev)
snd_soc_free_pcms(socdev); snd_soc_free_pcms(socdev);
snd_soc_dapm_free(socdev); snd_soc_dapm_free(socdev);
i2c_unregister_device(wm8903_i2c_device); i2c_unregister_device(socdev->codec->control_data);
i2c_del_driver(&wm8903_i2c_driver); i2c_del_driver(&wm8903_i2c_driver);
kfree(codec->private_data); kfree(codec->private_data);
kfree(codec); kfree(codec);