diff options
Diffstat (limited to 'sound/soc/codecs/wm9081.c')
-rw-r--r-- | sound/soc/codecs/wm9081.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index 686e5aa97206..c468497314ba 100644 --- a/sound/soc/codecs/wm9081.c +++ b/sound/soc/codecs/wm9081.c | |||
@@ -1262,19 +1262,9 @@ static int wm9081_probe(struct platform_device *pdev) | |||
1262 | snd_soc_dapm_new_controls(codec, wm9081_dapm_widgets, | 1262 | snd_soc_dapm_new_controls(codec, wm9081_dapm_widgets, |
1263 | ARRAY_SIZE(wm9081_dapm_widgets)); | 1263 | ARRAY_SIZE(wm9081_dapm_widgets)); |
1264 | snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths)); | 1264 | snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths)); |
1265 | snd_soc_dapm_new_widgets(codec); | ||
1266 | |||
1267 | ret = snd_soc_init_card(socdev); | ||
1268 | if (ret < 0) { | ||
1269 | dev_err(codec->dev, "failed to register card: %d\n", ret); | ||
1270 | goto card_err; | ||
1271 | } | ||
1272 | 1265 | ||
1273 | return ret; | 1266 | return ret; |
1274 | 1267 | ||
1275 | card_err: | ||
1276 | snd_soc_free_pcms(socdev); | ||
1277 | snd_soc_dapm_free(socdev); | ||
1278 | pcm_err: | 1268 | pcm_err: |
1279 | return ret; | 1269 | return ret; |
1280 | } | 1270 | } |
@@ -1452,21 +1442,6 @@ static __devexit int wm9081_i2c_remove(struct i2c_client *client) | |||
1452 | return 0; | 1442 | return 0; |
1453 | } | 1443 | } |
1454 | 1444 | ||
1455 | #ifdef CONFIG_PM | ||
1456 | static int wm9081_i2c_suspend(struct i2c_client *client, pm_message_t msg) | ||
1457 | { | ||
1458 | return snd_soc_suspend_device(&client->dev); | ||
1459 | } | ||
1460 | |||
1461 | static int wm9081_i2c_resume(struct i2c_client *client) | ||
1462 | { | ||
1463 | return snd_soc_resume_device(&client->dev); | ||
1464 | } | ||
1465 | #else | ||
1466 | #define wm9081_i2c_suspend NULL | ||
1467 | #define wm9081_i2c_resume NULL | ||
1468 | #endif | ||
1469 | |||
1470 | static const struct i2c_device_id wm9081_i2c_id[] = { | 1445 | static const struct i2c_device_id wm9081_i2c_id[] = { |
1471 | { "wm9081", 0 }, | 1446 | { "wm9081", 0 }, |
1472 | { } | 1447 | { } |
@@ -1480,8 +1455,6 @@ static struct i2c_driver wm9081_i2c_driver = { | |||
1480 | }, | 1455 | }, |
1481 | .probe = wm9081_i2c_probe, | 1456 | .probe = wm9081_i2c_probe, |
1482 | .remove = __devexit_p(wm9081_i2c_remove), | 1457 | .remove = __devexit_p(wm9081_i2c_remove), |
1483 | .suspend = wm9081_i2c_suspend, | ||
1484 | .resume = wm9081_i2c_resume, | ||
1485 | .id_table = wm9081_i2c_id, | 1458 | .id_table = wm9081_i2c_id, |
1486 | }; | 1459 | }; |
1487 | 1460 | ||