From b522c614ff4dd6b11927163817791ca47cc6ac2d Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=99=88=E9=87=91=E6=B3=89?= Date: Thu, 3 Apr 2014 16:21:16 +0800 Subject: [PATCH] Audio: add dev_pm_ops to machine driver, fix soc suspend/resume error. --- sound/soc/rockchip/rk2928-card.c | 19 ++++++++++--------- sound/soc/rockchip/rk_aic3111.c | 19 ++++++++++--------- sound/soc/rockchip/rk_aic3262.c | 19 ++++++++++--------- sound/soc/rockchip/rk_ak4396.c | 19 ++++++++++--------- sound/soc/rockchip/rk_cs42l52.c | 19 ++++++++++--------- sound/soc/rockchip/rk_cx2070x.c | 19 ++++++++++--------- sound/soc/rockchip/rk_es8323.c | 19 ++++++++++--------- sound/soc/rockchip/rk_hdmi_i2s.c | 15 ++++++++------- sound/soc/rockchip/rk_hdmi_spdif.c | 19 ++++++++++--------- sound/soc/rockchip/rk_jetta_codec.c | 19 ++++++++++--------- sound/soc/rockchip/rk_rk1000codec.c | 19 ++++++++++--------- sound/soc/rockchip/rk_rk3026.c | 19 ++++++++++--------- sound/soc/rockchip/rk_rk3190.c | 19 ++++++++++--------- sound/soc/rockchip/rk_rk616.c | 19 ++++++++++--------- sound/soc/rockchip/rk_rt3261.c | 19 ++++++++++--------- sound/soc/rockchip/rk_rt5512.c | 19 ++++++++++--------- sound/soc/rockchip/rk_rt5616.c | 19 ++++++++++--------- sound/soc/rockchip/rk_rt5621.c | 19 ++++++++++--------- sound/soc/rockchip/rk_rt5625.c | 19 ++++++++++--------- sound/soc/rockchip/rk_rt5631.c | 19 ++++++++++--------- sound/soc/rockchip/rk_rt5631_phone.c | 19 ++++++++++--------- sound/soc/rockchip/rk_rt5639.c | 19 ++++++++++--------- sound/soc/rockchip/rk_rt5640.c | 19 ++++++++++--------- sound/soc/rockchip/rk_wm8900.c | 19 ++++++++++--------- sound/soc/rockchip/rk_wm8988.c | 19 ++++++++++--------- sound/soc/rockchip/rk_wm8994.c | 19 ++++++++++--------- 26 files changed, 258 insertions(+), 232 deletions(-) diff --git a/sound/soc/rockchip/rk2928-card.c b/sound/soc/rockchip/rk2928-card.c index 4f2a244eb04c..84ad4ca34c1b 100755 --- a/sound/soc/rockchip/rk2928-card.c +++ b/sound/soc/rockchip/rk2928-card.c @@ -122,20 +122,21 @@ static int rockchip_rk2928_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_rk2928_of_match[] = { - { .compatible = "rockchip-rk2928", }, - {}, + { .compatible = "rockchip-rk2928", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_rk2928_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_rk2928_audio_driver = { - .driver = { - .name = "rockchip-rk2928", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_rk2928_of_match), - }, - .probe = rockchip_rk2928_audio_probe, - .remove = rockchip_rk2928_audio_remove, + .driver = { + .name = "rockchip-rk2928", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_rk2928_of_match), + }, + .probe = rockchip_rk2928_audio_probe, + .remove = rockchip_rk2928_audio_remove, }; module_platform_driver(rockchip_rk2928_audio_driver); diff --git a/sound/soc/rockchip/rk_aic3111.c b/sound/soc/rockchip/rk_aic3111.c index efb84fc70f2f..8daf90317417 100644 --- a/sound/soc/rockchip/rk_aic3111.c +++ b/sound/soc/rockchip/rk_aic3111.c @@ -179,20 +179,21 @@ static int rockchip_aic3111_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_aic3111_of_match[] = { - { .compatible = "rockchip-aic3111", }, - {}, + { .compatible = "rockchip-aic3111", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_aic3111_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_aic3111_audio_driver = { - .driver = { - .name = "rockchip-aic3111", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_aic3111_of_match), - }, - .probe = rockchip_aic3111_audio_probe, - .remove = rockchip_aic3111_audio_remove, + .driver = { + .name = "rockchip-aic3111", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_aic3111_of_match), + }, + .probe = rockchip_aic3111_audio_probe, + .remove = rockchip_aic3111_audio_remove, }; module_platform_driver(rockchip_aic3111_audio_driver); diff --git a/sound/soc/rockchip/rk_aic3262.c b/sound/soc/rockchip/rk_aic3262.c index 5312c4630b4b..eb554e6780e3 100644 --- a/sound/soc/rockchip/rk_aic3262.c +++ b/sound/soc/rockchip/rk_aic3262.c @@ -473,20 +473,21 @@ static int rockchip_aic3262_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_aic3262_of_match[] = { - { .compatible = "rockchip-aic3262", }, - {}, + { .compatible = "rockchip-aic3262", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_aic3262_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_aic3262_audio_driver = { - .driver = { - .name = "rockchip-aic3262", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_aic3262_of_match), - }, - .probe = rockchip_aic3262_audio_probe, - .remove = rockchip_aic3262_audio_remove, + .driver = { + .name = "rockchip-aic3262", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_aic3262_of_match), + }, + .probe = rockchip_aic3262_audio_probe, + .remove = rockchip_aic3262_audio_remove, }; module_platform_driver(rockchip_aic3262_audio_driver); diff --git a/sound/soc/rockchip/rk_ak4396.c b/sound/soc/rockchip/rk_ak4396.c index 3af5966bfc79..b3f84ca90083 100755 --- a/sound/soc/rockchip/rk_ak4396.c +++ b/sound/soc/rockchip/rk_ak4396.c @@ -165,20 +165,21 @@ static int rockchip_ak4396_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_ak4396_of_match[] = { - { .compatible = "rockchip-ak4396", }, - {}, + { .compatible = "rockchip-ak4396", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_ak4396_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_ak4396_audio_driver = { - .driver = { - .name = "rockchip-ak4396", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_ak4396_of_match), - }, - .probe = rockchip_ak4396_audio_probe, - .remove = rockchip_ak4396_audio_remove, + .driver = { + .name = "rockchip-ak4396", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_ak4396_of_match), + }, + .probe = rockchip_ak4396_audio_probe, + .remove = rockchip_ak4396_audio_remove, }; module_platform_driver(rockchip_ak4396_audio_driver); diff --git a/sound/soc/rockchip/rk_cs42l52.c b/sound/soc/rockchip/rk_cs42l52.c index 175b9e811be2..3c4673d6fe7e 100755 --- a/sound/soc/rockchip/rk_cs42l52.c +++ b/sound/soc/rockchip/rk_cs42l52.c @@ -186,20 +186,21 @@ static int rockchip_cs42l52_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_cs42l52_of_match[] = { - { .compatible = "rockchip-cs42l52", }, - {}, + { .compatible = "rockchip-cs42l52", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_cs42l52_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_cs42l52_audio_driver = { - .driver = { - .name = "rockchip-cs42l52", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_cs42l52_of_match), - }, - .probe = rockchip_cs42l52_audio_probe, - .remove = rockchip_cs42l52_audio_remove, + .driver = { + .name = "rockchip-cs42l52", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_cs42l52_of_match), + }, + .probe = rockchip_cs42l52_audio_probe, + .remove = rockchip_cs42l52_audio_remove, }; module_platform_driver(rockchip_cs42l52_audio_driver); diff --git a/sound/soc/rockchip/rk_cx2070x.c b/sound/soc/rockchip/rk_cx2070x.c index 83c00caba477..ac0c3c68f780 100644 --- a/sound/soc/rockchip/rk_cx2070x.c +++ b/sound/soc/rockchip/rk_cx2070x.c @@ -221,20 +221,21 @@ static int rockchip_cx2070x_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_cx2070x_of_match[] = { - { .compatible = "rockchip-cx2070x", }, - {}, + { .compatible = "rockchip-cx2070x", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_cx2070x_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_cx2070x_audio_driver = { - .driver = { - .name = "rockchip-cx2070x", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_cx2070x_of_match), - }, - .probe = rockchip_cx2070x_audio_probe, - .remove = rockchip_cx2070x_audio_remove, + .driver = { + .name = "rockchip-cx2070x", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_cx2070x_of_match), + }, + .probe = rockchip_cx2070x_audio_probe, + .remove = rockchip_cx2070x_audio_remove, }; module_platform_driver(rockchip_cx2070x_audio_driver); diff --git a/sound/soc/rockchip/rk_es8323.c b/sound/soc/rockchip/rk_es8323.c index 960634e413b1..c26f896002a7 100755 --- a/sound/soc/rockchip/rk_es8323.c +++ b/sound/soc/rockchip/rk_es8323.c @@ -192,20 +192,21 @@ static int rockchip_es8323_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_es8323_of_match[] = { - { .compatible = "rockchip-es8323", }, - {}, + { .compatible = "rockchip-es8323", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_es8323_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_es8323_audio_driver = { - .driver = { - .name = "rockchip-es8323", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_es8323_of_match), - }, - .probe = rockchip_es8323_audio_probe, - .remove = rockchip_es8323_audio_remove, + .driver = { + .name = "rockchip-es8323", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_es8323_of_match), + }, + .probe = rockchip_es8323_audio_probe, + .remove = rockchip_es8323_audio_remove, }; module_platform_driver(rockchip_es8323_audio_driver); diff --git a/sound/soc/rockchip/rk_hdmi_i2s.c b/sound/soc/rockchip/rk_hdmi_i2s.c index ae81712a1a7d..3e16d401c4b0 100644 --- a/sound/soc/rockchip/rk_hdmi_i2s.c +++ b/sound/soc/rockchip/rk_hdmi_i2s.c @@ -128,13 +128,14 @@ MODULE_DEVICE_TABLE(of, rockchip_hdmi_i2s_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_hdmi_i2s_audio_driver = { - .driver = { - .name = "rockchip-hdmi-i2s", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_hdmi_i2s_of_match), - }, - .probe = rockchip_hdmi_i2s_audio_probe, - .remove = rockchip_hdmi_i2s_audio_remove, + .driver = { + .name = "rockchip-hdmi-i2s", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_hdmi_i2s_of_match), + }, + .probe = rockchip_hdmi_i2s_audio_probe, + .remove = rockchip_hdmi_i2s_audio_remove, }; module_platform_driver(rockchip_hdmi_i2s_audio_driver); diff --git a/sound/soc/rockchip/rk_hdmi_spdif.c b/sound/soc/rockchip/rk_hdmi_spdif.c index 4875a4392b0f..897e9aba13ff 100755 --- a/sound/soc/rockchip/rk_hdmi_spdif.c +++ b/sound/soc/rockchip/rk_hdmi_spdif.c @@ -176,20 +176,21 @@ static int rockchip_hdmi_spdif_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_hdmi_spdif_of_match[] = { - { .compatible = "rockchip-hdmi-spdif"}, - {}, + { .compatible = "rockchip-hdmi-spdif"}, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_hdmi_spdif_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_hdmi_spdif_audio_driver = { - .driver = { - .name = "rockchip-hdmi-spdif", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_hdmi_spdif_of_match), - }, - .probe = rockchip_hdmi_spdif_audio_probe, - .remove = rockchip_hdmi_spdif_audio_remove, + .driver = { + .name = "rockchip-hdmi-spdif", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_hdmi_spdif_of_match), + }, + .probe = rockchip_hdmi_spdif_audio_probe, + .remove = rockchip_hdmi_spdif_audio_remove, }; module_platform_driver(rockchip_hdmi_spdif_audio_driver); diff --git a/sound/soc/rockchip/rk_jetta_codec.c b/sound/soc/rockchip/rk_jetta_codec.c index 9f06c662f272..6487cb681793 100755 --- a/sound/soc/rockchip/rk_jetta_codec.c +++ b/sound/soc/rockchip/rk_jetta_codec.c @@ -151,20 +151,21 @@ static int rockchip_rk610_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_rk610_of_match[] = { - { .compatible = "rockchip-rk610", }, - {}, + { .compatible = "rockchip-rk610", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_rk610_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_rk610_audio_driver = { - .driver = { - .name = "rockchip-rk610", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_rk610_of_match), - }, - .probe = rockchip_rk610_audio_probe, - .remove = rockchip_rk610_audio_remove, + .driver = { + .name = "rockchip-rk610", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_rk610_of_match), + }, + .probe = rockchip_rk610_audio_probe, + .remove = rockchip_rk610_audio_remove, }; module_platform_driver(rockchip_rk610_audio_driver); diff --git a/sound/soc/rockchip/rk_rk1000codec.c b/sound/soc/rockchip/rk_rk1000codec.c index ad7d59e24b6f..f10384687ac2 100755 --- a/sound/soc/rockchip/rk_rk1000codec.c +++ b/sound/soc/rockchip/rk_rk1000codec.c @@ -118,20 +118,21 @@ static int rockchip_rk1000_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_rk1000_of_match[] = { - { .compatible = "rockchip-rk1000", }, - {}, + { .compatible = "rockchip-rk1000", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_rk1000_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_rk1000_audio_driver = { - .driver = { - .name = "rockchip-rk1000", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_rk1000_of_match), - }, - .probe = rockchip_rk1000_audio_probe, - .remove = rockchip_rk1000_audio_remove, + .driver = { + .name = "rockchip-rk1000", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_rk1000_of_match), + }, + .probe = rockchip_rk1000_audio_probe, + .remove = rockchip_rk1000_audio_remove, }; module_platform_driver(rockchip_rk1000_audio_driver); diff --git a/sound/soc/rockchip/rk_rk3026.c b/sound/soc/rockchip/rk_rk3026.c index b904ba4ce63a..dfca69ff7f90 100644 --- a/sound/soc/rockchip/rk_rk3026.c +++ b/sound/soc/rockchip/rk_rk3026.c @@ -266,20 +266,21 @@ static int rockchip_rk3026_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_rk3026_of_match[] = { - { .compatible = "rockchip-rk3026", }, - {}, + { .compatible = "rockchip-rk3026", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_rk3026_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_rk3026_audio_driver = { - .driver = { - .name = "rockchip-rk3026", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_rk3026_of_match), - }, - .probe = rockchip_rk3026_audio_probe, - .remove = rockchip_rk3026_audio_remove, + .driver = { + .name = "rockchip-rk3026", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_rk3026_of_match), + }, + .probe = rockchip_rk3026_audio_probe, + .remove = rockchip_rk3026_audio_remove, }; module_platform_driver(rockchip_rk3026_audio_driver); diff --git a/sound/soc/rockchip/rk_rk3190.c b/sound/soc/rockchip/rk_rk3190.c index 2210b73d8d30..966fc815c1cd 100755 --- a/sound/soc/rockchip/rk_rk3190.c +++ b/sound/soc/rockchip/rk_rk3190.c @@ -244,20 +244,21 @@ static int rockchip_rk3190_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_rk3190_of_match[] = { - { .compatible = "rockchip-rk3190", }, - {}, + { .compatible = "rockchip-rk3190", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_rk3190_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_rk3190_audio_driver = { - .driver = { - .name = "rockchip-rk3190", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_rk3190_of_match), - }, - .probe = rockchip_rk3190_audio_probe, - .remove = rockchip_rk3190_audio_remove, + .driver = { + .name = "rockchip-rk3190", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_rk3190_of_match), + }, + .probe = rockchip_rk3190_audio_probe, + .remove = rockchip_rk3190_audio_remove, }; module_platform_driver(rockchip_rk3190_audio_driver); diff --git a/sound/soc/rockchip/rk_rk616.c b/sound/soc/rockchip/rk_rk616.c index 0f7a36c969bd..9d1fffdc2b24 100755 --- a/sound/soc/rockchip/rk_rk616.c +++ b/sound/soc/rockchip/rk_rk616.c @@ -347,20 +347,21 @@ static int rockchip_rk616_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_rk616_of_match[] = { - { .compatible = "rockchip-rk616", }, - {}, + { .compatible = "rockchip-rk616", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_rk616_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_rk616_audio_driver = { - .driver = { - .name = "rockchip-rk616", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_rk616_of_match), - }, - .probe = rockchip_rk616_audio_probe, - .remove = rockchip_rk616_audio_remove, + .driver = { + .name = "rockchip-rk616", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_rk616_of_match), + }, + .probe = rockchip_rk616_audio_probe, + .remove = rockchip_rk616_audio_remove, }; module_platform_driver(rockchip_rk616_audio_driver); diff --git a/sound/soc/rockchip/rk_rt3261.c b/sound/soc/rockchip/rk_rt3261.c index 66acee89dc19..cf1683ba5bcc 100644 --- a/sound/soc/rockchip/rk_rt3261.c +++ b/sound/soc/rockchip/rk_rt3261.c @@ -312,20 +312,21 @@ static int rockchip_rt3261_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_rt3261_of_match[] = { - { .compatible = "rockchip-rt3261", }, - {}, + { .compatible = "rockchip-rt3261", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_rt3261_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_rt3261_audio_driver = { - .driver = { - .name = "rockchip-rt3261", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_rt3261_of_match), - }, - .probe = rockchip_rt3261_audio_probe, - .remove = rockchip_rt3261_audio_remove, + .driver = { + .name = "rockchip-rt3261", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_rt3261_of_match), + }, + .probe = rockchip_rt3261_audio_probe, + .remove = rockchip_rt3261_audio_remove, }; module_platform_driver(rockchip_rt3261_audio_driver); diff --git a/sound/soc/rockchip/rk_rt5512.c b/sound/soc/rockchip/rk_rt5512.c index 3737d70ba40d..882f88c84e6b 100755 --- a/sound/soc/rockchip/rk_rt5512.c +++ b/sound/soc/rockchip/rk_rt5512.c @@ -320,20 +320,21 @@ static int rockchip_rt5512_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_rt5512_of_match[] = { - { .compatible = "rockchip-rt5512", }, - {}, + { .compatible = "rockchip-rt5512", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_rt5512_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_rt5512_audio_driver = { - .driver = { - .name = "rockchip-rt5512", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_rt5512_of_match), - }, - .probe = rockchip_rt5512_audio_probe, - .remove = rockchip_rt5512_audio_remove, + .driver = { + .name = "rockchip-rt5512", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_rt5512_of_match), + }, + .probe = rockchip_rt5512_audio_probe, + .remove = rockchip_rt5512_audio_remove, }; module_platform_driver(rockchip_rt5512_audio_driver); diff --git a/sound/soc/rockchip/rk_rt5616.c b/sound/soc/rockchip/rk_rt5616.c index b410bdfbbc74..f28a644d2569 100755 --- a/sound/soc/rockchip/rk_rt5616.c +++ b/sound/soc/rockchip/rk_rt5616.c @@ -190,20 +190,21 @@ static int rockchip_rt5616_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_rt5616_of_match[] = { - { .compatible = "rockchip-rt5616", }, - {}, + { .compatible = "rockchip-rt5616", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_rt5616_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_rt5616_audio_driver = { - .driver = { - .name = "rockchip-rt5616", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_rt5616_of_match), - }, - .probe = rockchip_rt5616_audio_probe, - .remove = rockchip_rt5616_audio_remove, + .driver = { + .name = "rockchip-rt5616", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_rt5616_of_match), + }, + .probe = rockchip_rt5616_audio_probe, + .remove = rockchip_rt5616_audio_remove, }; module_platform_driver(rockchip_rt5616_audio_driver); diff --git a/sound/soc/rockchip/rk_rt5621.c b/sound/soc/rockchip/rk_rt5621.c index c25d294db270..d0e6835deca1 100755 --- a/sound/soc/rockchip/rk_rt5621.c +++ b/sound/soc/rockchip/rk_rt5621.c @@ -189,20 +189,21 @@ static int rockchip_rt5621_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_rt5621_of_match[] = { - { .compatible = "rockchip-rt5621", }, - {}, + { .compatible = "rockchip-rt5621", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_rt5621_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_rt5621_audio_driver = { - .driver = { - .name = "rockchip-rt5621", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_rt5621_of_match), - }, - .probe = rockchip_rt5621_audio_probe, - .remove = rockchip_rt5621_audio_remove, + .driver = { + .name = "rockchip-rt5621", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_rt5621_of_match), + }, + .probe = rockchip_rt5621_audio_probe, + .remove = rockchip_rt5621_audio_remove, }; module_platform_driver(rockchip_rt5621_audio_driver); diff --git a/sound/soc/rockchip/rk_rt5625.c b/sound/soc/rockchip/rk_rt5625.c index 48400f8fdcb0..c78c06540f84 100644 --- a/sound/soc/rockchip/rk_rt5625.c +++ b/sound/soc/rockchip/rk_rt5625.c @@ -206,20 +206,21 @@ static int rockchip_rt5625_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_rt5625_of_match[] = { - { .compatible = "rockchip-rt5625", }, - {}, + { .compatible = "rockchip-rt5625", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_rt5625_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_rt5625_audio_driver = { - .driver = { - .name = "rockchip-rt5625", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_rt5625_of_match), - }, - .probe = rockchip_rt5625_audio_probe, - .remove = rockchip_rt5625_audio_remove, + .driver = { + .name = "rockchip-rt5625", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_rt5625_of_match), + }, + .probe = rockchip_rt5625_audio_probe, + .remove = rockchip_rt5625_audio_remove, }; module_platform_driver(rockchip_rt5625_audio_driver); diff --git a/sound/soc/rockchip/rk_rt5631.c b/sound/soc/rockchip/rk_rt5631.c index 44829172a9e4..529f521c80fa 100755 --- a/sound/soc/rockchip/rk_rt5631.c +++ b/sound/soc/rockchip/rk_rt5631.c @@ -212,20 +212,21 @@ static int rockchip_rt5631_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_rt5631_of_match[] = { - { .compatible = "rockchip-rt5631", }, - {}, + { .compatible = "rockchip-rt5631", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_rt5631_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_rt5631_audio_driver = { - .driver = { - .name = "rockchip-rt5631", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_rt5631_of_match), - }, - .probe = rockchip_rt5631_audio_probe, - .remove = rockchip_rt5631_audio_remove, + .driver = { + .name = "rockchip-rt5631", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_rt5631_of_match), + }, + .probe = rockchip_rt5631_audio_probe, + .remove = rockchip_rt5631_audio_remove, }; module_platform_driver(rockchip_rt5631_audio_driver); diff --git a/sound/soc/rockchip/rk_rt5631_phone.c b/sound/soc/rockchip/rk_rt5631_phone.c index 02f045a9dbea..06eeac8fa60d 100755 --- a/sound/soc/rockchip/rk_rt5631_phone.c +++ b/sound/soc/rockchip/rk_rt5631_phone.c @@ -265,20 +265,21 @@ static int rockchip_rt5631_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_rt5631_of_match[] = { - { .compatible = "rockchip-rt5631-phone", }, - {}, + { .compatible = "rockchip-rt5631-phone", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_rt5631_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_rt5631_audio_driver = { - .driver = { - .name = "rockchip-rt5631-phone", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_rt5631_of_match), - }, - .probe = rockchip_rt5631_audio_probe, - .remove = rockchip_rt5631_audio_remove, + .driver = { + .name = "rockchip-rt5631-phone", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_rt5631_of_match), + }, + .probe = rockchip_rt5631_audio_probe, + .remove = rockchip_rt5631_audio_remove, }; module_platform_driver(rockchip_rt5631_audio_driver); diff --git a/sound/soc/rockchip/rk_rt5639.c b/sound/soc/rockchip/rk_rt5639.c index 53db2c3305a8..4761b1adc2e0 100755 --- a/sound/soc/rockchip/rk_rt5639.c +++ b/sound/soc/rockchip/rk_rt5639.c @@ -206,20 +206,21 @@ static int rockchip_rt5639_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_rt5639_of_match[] = { - { .compatible = "rockchip-rt5639", }, - {}, + { .compatible = "rockchip-rt5639", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_rt5639_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_rt5639_audio_driver = { - .driver = { - .name = "rockchip-rt5639", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_rt5639_of_match), - }, - .probe = rockchip_rt5639_audio_probe, - .remove = rockchip_rt5639_audio_remove, + .driver = { + .name = "rockchip-rt5639", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_rt5639_of_match), + }, + .probe = rockchip_rt5639_audio_probe, + .remove = rockchip_rt5639_audio_remove, }; module_platform_driver(rockchip_rt5639_audio_driver); diff --git a/sound/soc/rockchip/rk_rt5640.c b/sound/soc/rockchip/rk_rt5640.c index ed41ee9cefcc..0ec9de7e86b4 100755 --- a/sound/soc/rockchip/rk_rt5640.c +++ b/sound/soc/rockchip/rk_rt5640.c @@ -278,20 +278,21 @@ static int rockchip_rt5640_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_rt5640_of_match[] = { - { .compatible = "rockchip-rt5640", }, - {}, + { .compatible = "rockchip-rt5640", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_rt5640_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_rt5640_audio_driver = { - .driver = { - .name = "rockchip-rt5640", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_rt5640_of_match), - }, - .probe = rockchip_rt5640_audio_probe, - .remove = rockchip_rt5640_audio_remove, + .driver = { + .name = "rockchip-rt5640", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_rt5640_of_match), + }, + .probe = rockchip_rt5640_audio_probe, + .remove = rockchip_rt5640_audio_remove, }; module_platform_driver(rockchip_rt5640_audio_driver); diff --git a/sound/soc/rockchip/rk_wm8900.c b/sound/soc/rockchip/rk_wm8900.c index d3fc1bbe6632..67f0961cd5d3 100755 --- a/sound/soc/rockchip/rk_wm8900.c +++ b/sound/soc/rockchip/rk_wm8900.c @@ -209,20 +209,21 @@ static int rockchip_wm8900_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_wm8900_of_match[] = { - { .compatible = "rockchip-wm8900", }, - {}, + { .compatible = "rockchip-wm8900", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_wm8900_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_wm8900_audio_driver = { - .driver = { - .name = "rockchip-wm8900", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_wm8900_of_match), - }, - .probe = rockchip_wm8900_audio_probe, - .remove = rockchip_wm8900_audio_remove, + .driver = { + .name = "rockchip-wm8900", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_wm8900_of_match), + }, + .probe = rockchip_wm8900_audio_probe, + .remove = rockchip_wm8900_audio_remove, }; module_platform_driver(rockchip_wm8900_audio_driver); diff --git a/sound/soc/rockchip/rk_wm8988.c b/sound/soc/rockchip/rk_wm8988.c index 14d36c216c71..31ca22924cf8 100755 --- a/sound/soc/rockchip/rk_wm8988.c +++ b/sound/soc/rockchip/rk_wm8988.c @@ -160,20 +160,21 @@ static int rockchip_wm8988_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_wm8988_of_match[] = { - { .compatible = "rockchip-wm8988", }, - {}, + { .compatible = "rockchip-wm8988", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_wm8988_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_wm8988_audio_driver = { - .driver = { - .name = "rockchip-wm8988", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_wm8988_of_match), - }, - .probe = rockchip_wm8988_audio_probe, - .remove = rockchip_wm8988_audio_remove, + .driver = { + .name = "rockchip-wm8988", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_wm8988_of_match), + }, + .probe = rockchip_wm8988_audio_probe, + .remove = rockchip_wm8988_audio_remove, }; module_platform_driver(rockchip_wm8988_audio_driver); diff --git a/sound/soc/rockchip/rk_wm8994.c b/sound/soc/rockchip/rk_wm8994.c index d0adf39e0ba8..b69b2b38554d 100755 --- a/sound/soc/rockchip/rk_wm8994.c +++ b/sound/soc/rockchip/rk_wm8994.c @@ -410,20 +410,21 @@ static int rockchip_wm8994_audio_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id rockchip_wm8994_of_match[] = { - { .compatible = "rockchip-wm8994", }, - {}, + { .compatible = "rockchip-wm8994", }, + {}, }; MODULE_DEVICE_TABLE(of, rockchip_wm8994_of_match); #endif /* CONFIG_OF */ static struct platform_driver rockchip_wm8994_audio_driver = { - .driver = { - .name = "rockchip-wm8994", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(rockchip_wm8994_of_match), - }, - .probe = rockchip_wm8994_audio_probe, - .remove = rockchip_wm8994_audio_remove, + .driver = { + .name = "rockchip-wm8994", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + .of_match_table = of_match_ptr(rockchip_wm8994_of_match), + }, + .probe = rockchip_wm8994_audio_probe, + .remove = rockchip_wm8994_audio_remove, }; module_platform_driver(rockchip_wm8994_audio_driver); -- 2.34.1