95d3d353f8
Copy patches from patches-6.1 to patches-6.6. No changes. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From f3f0934e5c7b9c16e0cb2435be3555382e6293ad Mon Sep 17 00:00:00 2001
|
|
From: Maso Huang <maso.huang@mediatek.com>
|
|
Date: Tue, 24 Oct 2023 11:50:17 +0800
|
|
Subject: [PATCH 7/9] ASoC: mediatek: mt7986: drop the remove callback of
|
|
mt7986_wm8960
|
|
|
|
Drop the remove callback of mt7986_wm8960.
|
|
|
|
Signed-off-by: Maso Huang <maso.huang@mediatek.com>
|
|
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
|
Link: https://lore.kernel.org/r/20231024035019.11732-2-maso.huang@mediatek.com
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
sound/soc/mediatek/mt7986/mt7986-wm8960.c | 10 ----------
|
|
1 file changed, 10 deletions(-)
|
|
|
|
--- a/sound/soc/mediatek/mt7986/mt7986-wm8960.c
|
|
+++ b/sound/soc/mediatek/mt7986/mt7986-wm8960.c
|
|
@@ -163,15 +163,6 @@ err_of_node_put:
|
|
return ret;
|
|
}
|
|
|
|
-static void mt7986_wm8960_machine_remove(struct platform_device *pdev)
|
|
-{
|
|
- struct snd_soc_card *card = platform_get_drvdata(pdev);
|
|
- struct mt7986_wm8960_priv *priv = snd_soc_card_get_drvdata(card);
|
|
-
|
|
- of_node_put(priv->codec_node);
|
|
- of_node_put(priv->platform_node);
|
|
-}
|
|
-
|
|
static const struct of_device_id mt7986_wm8960_machine_dt_match[] = {
|
|
{.compatible = "mediatek,mt7986-wm8960-sound"},
|
|
{ /* sentinel */ }
|
|
@@ -184,7 +175,6 @@ static struct platform_driver mt7986_wm8
|
|
.of_match_table = mt7986_wm8960_machine_dt_match,
|
|
},
|
|
.probe = mt7986_wm8960_machine_probe,
|
|
- .remove_new = mt7986_wm8960_machine_remove,
|
|
};
|
|
|
|
module_platform_driver(mt7986_wm8960_machine);
|