diff options
| -rw-r--r-- | include/sound/simple_card_utils.h | 2 | ||||
| -rw-r--r-- | sound/soc/generic/audio-graph-card.c | 2 | ||||
| -rw-r--r-- | sound/soc/generic/audio-graph-card2-custom-sample.c | 2 | ||||
| -rw-r--r-- | sound/soc/generic/audio-graph-card2.c | 2 | ||||
| -rw-r--r-- | sound/soc/generic/simple-card-utils.c | 4 | ||||
| -rw-r--r-- | sound/soc/generic/simple-card.c | 2 | ||||
| -rw-r--r-- | sound/soc/tegra/tegra_audio_graph_card.c | 2 |
7 files changed, 7 insertions, 9 deletions
diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 18e7a0b89395..e5da10b4c43b 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -188,7 +188,7 @@ int simple_util_init_aux_jacks(struct simple_util_priv *priv, char *prefix); int simple_util_init_priv(struct simple_util_priv *priv, struct link_info *li); -int simple_util_remove(struct platform_device *pdev); +void simple_util_remove(struct platform_device *pdev); int graph_util_card_probe(struct snd_soc_card *card); int graph_util_is_ports0(struct device_node *port); diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 704f32bda24d..76a9f1e8cdd5 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -644,7 +644,7 @@ static struct platform_driver graph_card = { .of_match_table = graph_of_match, }, .probe = graph_probe, - .remove = simple_util_remove, + .remove_new = simple_util_remove, }; module_platform_driver(graph_card); diff --git a/sound/soc/generic/audio-graph-card2-custom-sample.c b/sound/soc/generic/audio-graph-card2-custom-sample.c index 4dc65e249ecb..1b6ccd2de964 100644 --- a/sound/soc/generic/audio-graph-card2-custom-sample.c +++ b/sound/soc/generic/audio-graph-card2-custom-sample.c @@ -176,7 +176,7 @@ static struct platform_driver custom_card = { .of_match_table = custom_of_match, }, .probe = custom_probe, - .remove = simple_util_remove, + .remove_new = simple_util_remove, }; module_platform_driver(custom_card); diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index 1344e1adfc67..7146611df730 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -1224,7 +1224,7 @@ static struct platform_driver graph_card = { .of_match_table = graph_of_match, }, .probe = graph_probe, - .remove = simple_util_remove, + .remove_new = simple_util_remove, }; module_platform_driver(graph_card); diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 11f186ea662a..cfa70a56ff0f 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -958,13 +958,11 @@ int simple_util_init_priv(struct simple_util_priv *priv, } EXPORT_SYMBOL_GPL(simple_util_init_priv); -int simple_util_remove(struct platform_device *pdev) +void simple_util_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); simple_util_clean_reference(card); - - return 0; } EXPORT_SYMBOL_GPL(simple_util_remove); diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 048357ae7ae6..9c79ff6a568f 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -827,7 +827,7 @@ static struct platform_driver simple_card = { .of_match_table = simple_of_match, }, .probe = simple_probe, - .remove = simple_util_remove, + .remove_new = simple_util_remove, }; module_platform_driver(simple_card); diff --git a/sound/soc/tegra/tegra_audio_graph_card.c b/sound/soc/tegra/tegra_audio_graph_card.c index 8b48813c2c59..feba9d42bbc5 100644 --- a/sound/soc/tegra/tegra_audio_graph_card.c +++ b/sound/soc/tegra/tegra_audio_graph_card.c @@ -248,7 +248,7 @@ static struct platform_driver tegra_audio_graph_card = { .of_match_table = graph_of_tegra_match, }, .probe = tegra_audio_graph_probe, - .remove = simple_util_remove, + .remove_new = simple_util_remove, }; module_platform_driver(tegra_audio_graph_card); |