diff options
| author | Ed Blake <ed.blake@sondrel.com> | 2017-10-02 11:01:55 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-10-04 11:40:02 +0100 |
| commit | 2ab18dfe87596e207f17ff0567660cd7356c715a (patch) | |
| tree | e84db9ceed834f2412d4d9050adbca9afbdba20c /sound | |
| parent | c70458890ff15d858bd347fa9f563818bcd6e457 (diff) | |
| download | op-kernel-dev-2ab18dfe87596e207f17ff0567660cd7356c715a.zip op-kernel-dev-2ab18dfe87596e207f17ff0567660cd7356c715a.tar.gz | |
ASoC: img-spdif-out: Rename suspend / resume funcs
Rename suspend and resume functions to runtime_suspend and
runtime_resume, which is what they actually are. This will avoid
confusion when adding suspend and resume functions in a subsequent
patch.
Signed-off-by: Ed Blake <ed.blake@sondrel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/img/img-spdif-out.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/img/img-spdif-out.c b/sound/soc/img/img-spdif-out.c index 383655d..416aa57 100644 --- a/sound/soc/img/img-spdif-out.c +++ b/sound/soc/img/img-spdif-out.c @@ -49,7 +49,7 @@ struct img_spdif_out { struct reset_control *rst; }; -static int img_spdif_out_suspend(struct device *dev) +static int img_spdif_out_runtime_suspend(struct device *dev) { struct img_spdif_out *spdif = dev_get_drvdata(dev); @@ -58,7 +58,7 @@ static int img_spdif_out_suspend(struct device *dev) return 0; } -static int img_spdif_out_resume(struct device *dev) +static int img_spdif_out_runtime_resume(struct device *dev) { struct img_spdif_out *spdif = dev_get_drvdata(dev); int ret; @@ -366,7 +366,7 @@ static int img_spdif_out_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); if (!pm_runtime_enabled(&pdev->dev)) { - ret = img_spdif_out_resume(&pdev->dev); + ret = img_spdif_out_runtime_resume(&pdev->dev); if (ret) goto err_pm_disable; } @@ -393,7 +393,7 @@ static int img_spdif_out_probe(struct platform_device *pdev) err_suspend: if (!pm_runtime_status_suspended(&pdev->dev)) - img_spdif_out_suspend(&pdev->dev); + img_spdif_out_runtime_suspend(&pdev->dev); err_pm_disable: pm_runtime_disable(&pdev->dev); clk_disable_unprepare(spdif->clk_sys); @@ -407,7 +407,7 @@ static int img_spdif_out_dev_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); if (!pm_runtime_status_suspended(&pdev->dev)) - img_spdif_out_suspend(&pdev->dev); + img_spdif_out_runtime_suspend(&pdev->dev); clk_disable_unprepare(spdif->clk_sys); @@ -421,8 +421,8 @@ static const struct of_device_id img_spdif_out_of_match[] = { MODULE_DEVICE_TABLE(of, img_spdif_out_of_match); static const struct dev_pm_ops img_spdif_out_pm_ops = { - SET_RUNTIME_PM_OPS(img_spdif_out_suspend, - img_spdif_out_resume, NULL) + SET_RUNTIME_PM_OPS(img_spdif_out_runtime_suspend, + img_spdif_out_runtime_resume, NULL) }; static struct platform_driver img_spdif_out_driver = { |
