mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
Update devfreq next for v6.10
Detailed description for this pull request: - Convert to platfrom remove callback to .remove_new ops for following drivers : exyno-nocp.c/exynos-ppmu.c/mtk-cci-devfreq.c/sun8i-a33-mbus.c/rk3399_dmc.c - Use DEFINE_SIMPLE_PM_OPS for exyno-bus.c driver -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEsSpuqBtbWtRe4rLGnM3fLN7rz1MFAmY7oCIACgkQnM3fLN7r z1NSiw//VjokoB/0QSPyzz1whS0yX3L2fOnC/b0iysTthlF2CsPDOclVIgfAWq9u 45NBXy5CC+xCh/XzAkkfLsDGdux9/XWu5b3l40Q6Q5QDYUN6WxUR7h3mRyTz5TLh mmeEQvYVE/+0VzS1aFiqY2sCg1UvW03Uyvli5zsMIXjOaxvOtz007aR09JzIStVQ lt1dnlJI/1jCLvKKdVelu1yV4Vm+LzCrFK+c6E3/EZrv0dKaXuJpM29HMSDPNDyi PfAHEQi/Hnx+hLZaGFeaejiBHh3m1zMEEqzzGg8ijxDXhTxY+OBTbMG78rSxllS+ orwM0LurDVRwG9JFsDPT47aZ2w8FYHJ9z0gmCexQ7gMKJJ/VMLsZX4pdJinyFSUy FifaGJ/t3YQ5RUej7Od4PamXRoRCQsrP5e8D3m4VQBiV6g0YS+1bbkfe6TWXc98t mhHsFVw+VjxIjEpxGgS9AB60k3oMQZXICbvsGjQaT8hDSKCAm4biSiEz0rYNTISU anxjzkz//1jBM7p02A57MN85mzOCfS6GcvfuJ2R/rIBJn9NaWnoujHNdXRZdMWYq zmDrgXUT8k0Sh8s8zA34hrIB1BU4XxO5cPXu/tQ2n7srDoik3qfh9Hz1qZl27eAj 5itIg1fRdT+UBwlaqZUENlC4nhkjDzQ0/EA9dNpGSv0q62g5T2E= =LFyw -----END PGP SIGNATURE----- Merge tag 'devfreq-next-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux Merge devfreq updates for v6.10 from Chanwoo Choi: - Convert the platfrom remove callback to .remove_new ops for following drivers: exyno-nocp.c/exynos-ppmu.c/mtk-cci-devfreq.c/ sun8i-a33-mbus.c/rk3399_dmc.c - Use DEFINE_SIMPLE_PM_OPS for exyno-bus.c driver * tag 'devfreq-next-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux: PM / devfreq: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void PM / devfreq: sun8i-a33-mbus: Convert to platform remove callback returning void PM / devfreq: mtk-cci: Convert to platform remove callback returning void PM / devfreq: exynos-ppmu: Convert to platform remove callback returning void PM / devfreq: exynos-nocp: Convert to platform remove callback returning void
This commit is contained in:
commit
eefb5dbddd
6 changed files with 13 additions and 26 deletions
|
@ -275,18 +275,16 @@ static int exynos_nocp_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int exynos_nocp_remove(struct platform_device *pdev)
|
||||
static void exynos_nocp_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct exynos_nocp *nocp = platform_get_drvdata(pdev);
|
||||
|
||||
clk_disable_unprepare(nocp->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver exynos_nocp_driver = {
|
||||
.probe = exynos_nocp_probe,
|
||||
.remove = exynos_nocp_remove,
|
||||
.remove_new = exynos_nocp_remove,
|
||||
.driver = {
|
||||
.name = "exynos-nocp",
|
||||
.of_match_table = exynos_nocp_id_match,
|
||||
|
|
|
@ -692,18 +692,16 @@ static int exynos_ppmu_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int exynos_ppmu_remove(struct platform_device *pdev)
|
||||
static void exynos_ppmu_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct exynos_ppmu *info = platform_get_drvdata(pdev);
|
||||
|
||||
clk_disable_unprepare(info->ppmu.clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver exynos_ppmu_driver = {
|
||||
.probe = exynos_ppmu_probe,
|
||||
.remove = exynos_ppmu_remove,
|
||||
.remove_new = exynos_ppmu_remove,
|
||||
.driver = {
|
||||
.name = "exynos-ppmu",
|
||||
.of_match_table = exynos_ppmu_id_match,
|
||||
|
|
|
@ -467,7 +467,6 @@ static void exynos_bus_shutdown(struct platform_device *pdev)
|
|||
devfreq_suspend_device(bus->devfreq);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int exynos_bus_resume(struct device *dev)
|
||||
{
|
||||
struct exynos_bus *bus = dev_get_drvdata(dev);
|
||||
|
@ -495,11 +494,9 @@ static int exynos_bus_suspend(struct device *dev)
|
|||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static const struct dev_pm_ops exynos_bus_pm = {
|
||||
SET_SYSTEM_SLEEP_PM_OPS(exynos_bus_suspend, exynos_bus_resume)
|
||||
};
|
||||
static DEFINE_SIMPLE_DEV_PM_OPS(exynos_bus_pm,
|
||||
exynos_bus_suspend, exynos_bus_resume);
|
||||
|
||||
static const struct of_device_id exynos_bus_of_match[] = {
|
||||
{ .compatible = "samsung,exynos-bus", },
|
||||
|
@ -512,7 +509,7 @@ static struct platform_driver exynos_bus_platdrv = {
|
|||
.shutdown = exynos_bus_shutdown,
|
||||
.driver = {
|
||||
.name = "exynos-bus",
|
||||
.pm = &exynos_bus_pm,
|
||||
.pm = pm_sleep_ptr(&exynos_bus_pm),
|
||||
.of_match_table = exynos_bus_of_match,
|
||||
},
|
||||
};
|
||||
|
|
|
@ -392,7 +392,7 @@ static int mtk_ccifreq_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int mtk_ccifreq_remove(struct platform_device *pdev)
|
||||
static void mtk_ccifreq_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct mtk_ccifreq_drv *drv;
|
||||
|
@ -405,8 +405,6 @@ static int mtk_ccifreq_remove(struct platform_device *pdev)
|
|||
regulator_disable(drv->proc_reg);
|
||||
if (drv->sram_reg)
|
||||
regulator_disable(drv->sram_reg);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct mtk_ccifreq_platform_data mt8183_platform_data = {
|
||||
|
@ -432,7 +430,7 @@ MODULE_DEVICE_TABLE(of, mtk_ccifreq_machines);
|
|||
|
||||
static struct platform_driver mtk_ccifreq_platdrv = {
|
||||
.probe = mtk_ccifreq_probe,
|
||||
.remove = mtk_ccifreq_remove,
|
||||
.remove_new = mtk_ccifreq_remove,
|
||||
.driver = {
|
||||
.name = "mtk-ccifreq",
|
||||
.of_match_table = mtk_ccifreq_machines,
|
||||
|
|
|
@ -459,13 +459,11 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int rk3399_dmcfreq_remove(struct platform_device *pdev)
|
||||
static void rk3399_dmcfreq_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct rk3399_dmcfreq *dmcfreq = dev_get_drvdata(&pdev->dev);
|
||||
|
||||
devfreq_event_disable_edev(dmcfreq->edev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id rk3399dmc_devfreq_of_match[] = {
|
||||
|
@ -476,7 +474,7 @@ MODULE_DEVICE_TABLE(of, rk3399dmc_devfreq_of_match);
|
|||
|
||||
static struct platform_driver rk3399_dmcfreq_driver = {
|
||||
.probe = rk3399_dmcfreq_probe,
|
||||
.remove = rk3399_dmcfreq_remove,
|
||||
.remove_new = rk3399_dmcfreq_remove,
|
||||
.driver = {
|
||||
.name = "rk3399-dmc-freq",
|
||||
.pm = &rk3399_dmcfreq_pm,
|
||||
|
|
|
@ -458,7 +458,7 @@ static int sun8i_a33_mbus_probe(struct platform_device *pdev)
|
|||
return dev_err_probe(dev, ret, err);
|
||||
}
|
||||
|
||||
static int sun8i_a33_mbus_remove(struct platform_device *pdev)
|
||||
static void sun8i_a33_mbus_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct sun8i_a33_mbus *priv = platform_get_drvdata(pdev);
|
||||
unsigned long initial_freq = priv->profile.initial_freq;
|
||||
|
@ -475,8 +475,6 @@ static int sun8i_a33_mbus_remove(struct platform_device *pdev)
|
|||
clk_rate_exclusive_put(priv->clk_mbus);
|
||||
clk_rate_exclusive_put(priv->clk_dram);
|
||||
clk_disable_unprepare(priv->clk_bus);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct sun8i_a33_mbus_variant sun50i_a64_mbus = {
|
||||
|
@ -497,7 +495,7 @@ static SIMPLE_DEV_PM_OPS(sun8i_a33_mbus_pm_ops,
|
|||
|
||||
static struct platform_driver sun8i_a33_mbus_driver = {
|
||||
.probe = sun8i_a33_mbus_probe,
|
||||
.remove = sun8i_a33_mbus_remove,
|
||||
.remove_new = sun8i_a33_mbus_remove,
|
||||
.driver = {
|
||||
.name = "sun8i-a33-mbus",
|
||||
.of_match_table = sun8i_a33_mbus_of_match,
|
||||
|
|
Loading…
Reference in a new issue