Message ID | 20220208124034.414635-29-wenst@chromium.org (mailing list archive) |
---|---|
State | Mainlined, archived |
Headers | show |
Series | clk: mediatek: Cleanups and Improvements - Part 1 | expand |
Il 08/02/22 13:40, Chen-Yu Tsai ha scritto: > Various small clock controllers only have clock gates, and utilize > mtk_clk_simple_probe() as their driver probe function. > > Now that we have a matching remove function, hook it up for the relevant > drivers. This was done with the following command: > > sed -i -e '/mtk_clk_simple_probe/a \ > .remove = mtk_clk_simple_remove,' drivers/clk/mediatek/clk-mt8195-*.c > > Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> > Reviewed-by: Miles Chen <miles.chen@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
On Tue, 2022-02-08 at 20:40 +0800, Chen-Yu Tsai wrote: > Various small clock controllers only have clock gates, and utilize > mtk_clk_simple_probe() as their driver probe function. > > Now that we have a matching remove function, hook it up for the > relevant > drivers. This was done with the following command: > > sed -i -e '/mtk_clk_simple_probe/a \ > .remove = mtk_clk_simple_remove,' drivers/clk/mediatek/clk- > mt8195-*.c > > Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> > Reviewed-by: Miles Chen <miles.chen@mediatek.com> Reviewed-by: Chun-Jie Chen <chun-jie.chen@mediatek.com> > --- > drivers/clk/mediatek/clk-mt8195-cam.c | 1 + > drivers/clk/mediatek/clk-mt8195-ccu.c | 1 + > drivers/clk/mediatek/clk-mt8195-img.c | 1 + > drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c | 1 + > drivers/clk/mediatek/clk-mt8195-infra_ao.c | 1 + > drivers/clk/mediatek/clk-mt8195-ipe.c | 1 + > drivers/clk/mediatek/clk-mt8195-mfg.c | 1 + > drivers/clk/mediatek/clk-mt8195-peri_ao.c | 1 + > drivers/clk/mediatek/clk-mt8195-scp_adsp.c | 1 + > drivers/clk/mediatek/clk-mt8195-vdec.c | 1 + > drivers/clk/mediatek/clk-mt8195-venc.c | 1 + > drivers/clk/mediatek/clk-mt8195-vpp0.c | 1 + > drivers/clk/mediatek/clk-mt8195-vpp1.c | 1 + > drivers/clk/mediatek/clk-mt8195-wpe.c | 1 + > 14 files changed, 14 insertions(+) > > diff --git a/drivers/clk/mediatek/clk-mt8195-cam.c > b/drivers/clk/mediatek/clk-mt8195-cam.c > index 3d261fc3848e..e4d00fe6e757 100644 > --- a/drivers/clk/mediatek/clk-mt8195-cam.c > +++ b/drivers/clk/mediatek/clk-mt8195-cam.c > @@ -134,6 +134,7 @@ static const struct of_device_id > of_match_clk_mt8195_cam[] = { > > static struct platform_driver clk_mt8195_cam_drv = { > .probe = mtk_clk_simple_probe, > + .remove = mtk_clk_simple_remove, > .driver = { > .name = "clk-mt8195-cam", > .of_match_table = of_match_clk_mt8195_cam, > diff --git a/drivers/clk/mediatek/clk-mt8195-ccu.c > b/drivers/clk/mediatek/clk-mt8195-ccu.c > index f846f1d73605..4e326b6301ba 100644 > --- a/drivers/clk/mediatek/clk-mt8195-ccu.c > +++ b/drivers/clk/mediatek/clk-mt8195-ccu.c > @@ -42,6 +42,7 @@ static const struct of_device_id > of_match_clk_mt8195_ccu[] = { > > static struct platform_driver clk_mt8195_ccu_drv = { > .probe = mtk_clk_simple_probe, > + .remove = mtk_clk_simple_remove, > .driver = { > .name = "clk-mt8195-ccu", > .of_match_table = of_match_clk_mt8195_ccu, > diff --git a/drivers/clk/mediatek/clk-mt8195-img.c > b/drivers/clk/mediatek/clk-mt8195-img.c > index 22b52a8f15fe..12f5c436d075 100644 > --- a/drivers/clk/mediatek/clk-mt8195-img.c > +++ b/drivers/clk/mediatek/clk-mt8195-img.c > @@ -88,6 +88,7 @@ static const struct of_device_id > of_match_clk_mt8195_img[] = { > > static struct platform_driver clk_mt8195_img_drv = { > .probe = mtk_clk_simple_probe, > + .remove = mtk_clk_simple_remove, > .driver = { > .name = "clk-mt8195-img", > .of_match_table = of_match_clk_mt8195_img, > diff --git a/drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c > b/drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c > index 4ab312eb26a5..fbc809d05072 100644 > --- a/drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c > +++ b/drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c > @@ -58,6 +58,7 @@ static const struct of_device_id > of_match_clk_mt8195_imp_iic_wrap[] = { > > static struct platform_driver clk_mt8195_imp_iic_wrap_drv = { > .probe = mtk_clk_simple_probe, > + .remove = mtk_clk_simple_remove, > .driver = { > .name = "clk-mt8195-imp_iic_wrap", > .of_match_table = of_match_clk_mt8195_imp_iic_wrap, > diff --git a/drivers/clk/mediatek/clk-mt8195-infra_ao.c > b/drivers/clk/mediatek/clk-mt8195-infra_ao.c > index 5f9b69967459..8ebe3b9415c4 100644 > --- a/drivers/clk/mediatek/clk-mt8195-infra_ao.c > +++ b/drivers/clk/mediatek/clk-mt8195-infra_ao.c > @@ -198,6 +198,7 @@ static const struct of_device_id > of_match_clk_mt8195_infra_ao[] = { > > static struct platform_driver clk_mt8195_infra_ao_drv = { > .probe = mtk_clk_simple_probe, > + .remove = mtk_clk_simple_remove, > .driver = { > .name = "clk-mt8195-infra_ao", > .of_match_table = of_match_clk_mt8195_infra_ao, > diff --git a/drivers/clk/mediatek/clk-mt8195-ipe.c > b/drivers/clk/mediatek/clk-mt8195-ipe.c > index fc1d42b6ac84..b0d745cf7752 100644 > --- a/drivers/clk/mediatek/clk-mt8195-ipe.c > +++ b/drivers/clk/mediatek/clk-mt8195-ipe.c > @@ -43,6 +43,7 @@ static const struct of_device_id > of_match_clk_mt8195_ipe[] = { > > static struct platform_driver clk_mt8195_ipe_drv = { > .probe = mtk_clk_simple_probe, > + .remove = mtk_clk_simple_remove, > .driver = { > .name = "clk-mt8195-ipe", > .of_match_table = of_match_clk_mt8195_ipe, > diff --git a/drivers/clk/mediatek/clk-mt8195-mfg.c > b/drivers/clk/mediatek/clk-mt8195-mfg.c > index aca6d9c0837c..9411c556a5a9 100644 > --- a/drivers/clk/mediatek/clk-mt8195-mfg.c > +++ b/drivers/clk/mediatek/clk-mt8195-mfg.c > @@ -39,6 +39,7 @@ static const struct of_device_id > of_match_clk_mt8195_mfg[] = { > > static struct platform_driver clk_mt8195_mfg_drv = { > .probe = mtk_clk_simple_probe, > + .remove = mtk_clk_simple_remove, > .driver = { > .name = "clk-mt8195-mfg", > .of_match_table = of_match_clk_mt8195_mfg, > diff --git a/drivers/clk/mediatek/clk-mt8195-peri_ao.c > b/drivers/clk/mediatek/clk-mt8195-peri_ao.c > index 907a92b22de8..2f6b3bb657db 100644 > --- a/drivers/clk/mediatek/clk-mt8195-peri_ao.c > +++ b/drivers/clk/mediatek/clk-mt8195-peri_ao.c > @@ -54,6 +54,7 @@ static const struct of_device_id > of_match_clk_mt8195_peri_ao[] = { > > static struct platform_driver clk_mt8195_peri_ao_drv = { > .probe = mtk_clk_simple_probe, > + .remove = mtk_clk_simple_remove, > .driver = { > .name = "clk-mt8195-peri_ao", > .of_match_table = of_match_clk_mt8195_peri_ao, > diff --git a/drivers/clk/mediatek/clk-mt8195-scp_adsp.c > b/drivers/clk/mediatek/clk-mt8195-scp_adsp.c > index 26b4846c5894..e16c383f631b 100644 > --- a/drivers/clk/mediatek/clk-mt8195-scp_adsp.c > +++ b/drivers/clk/mediatek/clk-mt8195-scp_adsp.c > @@ -39,6 +39,7 @@ static const struct of_device_id > of_match_clk_mt8195_scp_adsp[] = { > > static struct platform_driver clk_mt8195_scp_adsp_drv = { > .probe = mtk_clk_simple_probe, > + .remove = mtk_clk_simple_remove, > .driver = { > .name = "clk-mt8195-scp_adsp", > .of_match_table = of_match_clk_mt8195_scp_adsp, > diff --git a/drivers/clk/mediatek/clk-mt8195-vdec.c > b/drivers/clk/mediatek/clk-mt8195-vdec.c > index a1df04f42a90..a1446b666385 100644 > --- a/drivers/clk/mediatek/clk-mt8195-vdec.c > +++ b/drivers/clk/mediatek/clk-mt8195-vdec.c > @@ -96,6 +96,7 @@ static const struct of_device_id > of_match_clk_mt8195_vdec[] = { > > static struct platform_driver clk_mt8195_vdec_drv = { > .probe = mtk_clk_simple_probe, > + .remove = mtk_clk_simple_remove, > .driver = { > .name = "clk-mt8195-vdec", > .of_match_table = of_match_clk_mt8195_vdec, > diff --git a/drivers/clk/mediatek/clk-mt8195-venc.c > b/drivers/clk/mediatek/clk-mt8195-venc.c > index 7339851a0856..622f57804f96 100644 > --- a/drivers/clk/mediatek/clk-mt8195-venc.c > +++ b/drivers/clk/mediatek/clk-mt8195-venc.c > @@ -61,6 +61,7 @@ static const struct of_device_id > of_match_clk_mt8195_venc[] = { > > static struct platform_driver clk_mt8195_venc_drv = { > .probe = mtk_clk_simple_probe, > + .remove = mtk_clk_simple_remove, > .driver = { > .name = "clk-mt8195-venc", > .of_match_table = of_match_clk_mt8195_venc, > diff --git a/drivers/clk/mediatek/clk-mt8195-vpp0.c > b/drivers/clk/mediatek/clk-mt8195-vpp0.c > index c3241466a8d0..bf2939c3a023 100644 > --- a/drivers/clk/mediatek/clk-mt8195-vpp0.c > +++ b/drivers/clk/mediatek/clk-mt8195-vpp0.c > @@ -102,6 +102,7 @@ static const struct of_device_id > of_match_clk_mt8195_vpp0[] = { > > static struct platform_driver clk_mt8195_vpp0_drv = { > .probe = mtk_clk_simple_probe, > + .remove = mtk_clk_simple_remove, > .driver = { > .name = "clk-mt8195-vpp0", > .of_match_table = of_match_clk_mt8195_vpp0, > diff --git a/drivers/clk/mediatek/clk-mt8195-vpp1.c > b/drivers/clk/mediatek/clk-mt8195-vpp1.c > index ce0b9a40a179..ffd52c762890 100644 > --- a/drivers/clk/mediatek/clk-mt8195-vpp1.c > +++ b/drivers/clk/mediatek/clk-mt8195-vpp1.c > @@ -100,6 +100,7 @@ static const struct of_device_id > of_match_clk_mt8195_vpp1[] = { > > static struct platform_driver clk_mt8195_vpp1_drv = { > .probe = mtk_clk_simple_probe, > + .remove = mtk_clk_simple_remove, > .driver = { > .name = "clk-mt8195-vpp1", > .of_match_table = of_match_clk_mt8195_vpp1, > diff --git a/drivers/clk/mediatek/clk-mt8195-wpe.c > b/drivers/clk/mediatek/clk-mt8195-wpe.c > index 274d60838d8e..b483fab10e18 100644 > --- a/drivers/clk/mediatek/clk-mt8195-wpe.c > +++ b/drivers/clk/mediatek/clk-mt8195-wpe.c > @@ -135,6 +135,7 @@ static const struct of_device_id > of_match_clk_mt8195_wpe[] = { > > static struct platform_driver clk_mt8195_wpe_drv = { > .probe = mtk_clk_simple_probe, > + .remove = mtk_clk_simple_remove, > .driver = { > .name = "clk-mt8195-wpe", > .of_match_table = of_match_clk_mt8195_wpe,
Quoting Chen-Yu Tsai (2022-02-08 04:40:31) > Various small clock controllers only have clock gates, and utilize > mtk_clk_simple_probe() as their driver probe function. > > Now that we have a matching remove function, hook it up for the relevant > drivers. This was done with the following command: > > sed -i -e '/mtk_clk_simple_probe/a \ > .remove = mtk_clk_simple_remove,' drivers/clk/mediatek/clk-mt8195-*.c > > Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> > Reviewed-by: Miles Chen <miles.chen@mediatek.com> > --- Applied to clk-next
diff --git a/drivers/clk/mediatek/clk-mt8195-cam.c b/drivers/clk/mediatek/clk-mt8195-cam.c index 3d261fc3848e..e4d00fe6e757 100644 --- a/drivers/clk/mediatek/clk-mt8195-cam.c +++ b/drivers/clk/mediatek/clk-mt8195-cam.c @@ -134,6 +134,7 @@ static const struct of_device_id of_match_clk_mt8195_cam[] = { static struct platform_driver clk_mt8195_cam_drv = { .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8195-cam", .of_match_table = of_match_clk_mt8195_cam, diff --git a/drivers/clk/mediatek/clk-mt8195-ccu.c b/drivers/clk/mediatek/clk-mt8195-ccu.c index f846f1d73605..4e326b6301ba 100644 --- a/drivers/clk/mediatek/clk-mt8195-ccu.c +++ b/drivers/clk/mediatek/clk-mt8195-ccu.c @@ -42,6 +42,7 @@ static const struct of_device_id of_match_clk_mt8195_ccu[] = { static struct platform_driver clk_mt8195_ccu_drv = { .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8195-ccu", .of_match_table = of_match_clk_mt8195_ccu, diff --git a/drivers/clk/mediatek/clk-mt8195-img.c b/drivers/clk/mediatek/clk-mt8195-img.c index 22b52a8f15fe..12f5c436d075 100644 --- a/drivers/clk/mediatek/clk-mt8195-img.c +++ b/drivers/clk/mediatek/clk-mt8195-img.c @@ -88,6 +88,7 @@ static const struct of_device_id of_match_clk_mt8195_img[] = { static struct platform_driver clk_mt8195_img_drv = { .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8195-img", .of_match_table = of_match_clk_mt8195_img, diff --git a/drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c b/drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c index 4ab312eb26a5..fbc809d05072 100644 --- a/drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c +++ b/drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c @@ -58,6 +58,7 @@ static const struct of_device_id of_match_clk_mt8195_imp_iic_wrap[] = { static struct platform_driver clk_mt8195_imp_iic_wrap_drv = { .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8195-imp_iic_wrap", .of_match_table = of_match_clk_mt8195_imp_iic_wrap, diff --git a/drivers/clk/mediatek/clk-mt8195-infra_ao.c b/drivers/clk/mediatek/clk-mt8195-infra_ao.c index 5f9b69967459..8ebe3b9415c4 100644 --- a/drivers/clk/mediatek/clk-mt8195-infra_ao.c +++ b/drivers/clk/mediatek/clk-mt8195-infra_ao.c @@ -198,6 +198,7 @@ static const struct of_device_id of_match_clk_mt8195_infra_ao[] = { static struct platform_driver clk_mt8195_infra_ao_drv = { .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8195-infra_ao", .of_match_table = of_match_clk_mt8195_infra_ao, diff --git a/drivers/clk/mediatek/clk-mt8195-ipe.c b/drivers/clk/mediatek/clk-mt8195-ipe.c index fc1d42b6ac84..b0d745cf7752 100644 --- a/drivers/clk/mediatek/clk-mt8195-ipe.c +++ b/drivers/clk/mediatek/clk-mt8195-ipe.c @@ -43,6 +43,7 @@ static const struct of_device_id of_match_clk_mt8195_ipe[] = { static struct platform_driver clk_mt8195_ipe_drv = { .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8195-ipe", .of_match_table = of_match_clk_mt8195_ipe, diff --git a/drivers/clk/mediatek/clk-mt8195-mfg.c b/drivers/clk/mediatek/clk-mt8195-mfg.c index aca6d9c0837c..9411c556a5a9 100644 --- a/drivers/clk/mediatek/clk-mt8195-mfg.c +++ b/drivers/clk/mediatek/clk-mt8195-mfg.c @@ -39,6 +39,7 @@ static const struct of_device_id of_match_clk_mt8195_mfg[] = { static struct platform_driver clk_mt8195_mfg_drv = { .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8195-mfg", .of_match_table = of_match_clk_mt8195_mfg, diff --git a/drivers/clk/mediatek/clk-mt8195-peri_ao.c b/drivers/clk/mediatek/clk-mt8195-peri_ao.c index 907a92b22de8..2f6b3bb657db 100644 --- a/drivers/clk/mediatek/clk-mt8195-peri_ao.c +++ b/drivers/clk/mediatek/clk-mt8195-peri_ao.c @@ -54,6 +54,7 @@ static const struct of_device_id of_match_clk_mt8195_peri_ao[] = { static struct platform_driver clk_mt8195_peri_ao_drv = { .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8195-peri_ao", .of_match_table = of_match_clk_mt8195_peri_ao, diff --git a/drivers/clk/mediatek/clk-mt8195-scp_adsp.c b/drivers/clk/mediatek/clk-mt8195-scp_adsp.c index 26b4846c5894..e16c383f631b 100644 --- a/drivers/clk/mediatek/clk-mt8195-scp_adsp.c +++ b/drivers/clk/mediatek/clk-mt8195-scp_adsp.c @@ -39,6 +39,7 @@ static const struct of_device_id of_match_clk_mt8195_scp_adsp[] = { static struct platform_driver clk_mt8195_scp_adsp_drv = { .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8195-scp_adsp", .of_match_table = of_match_clk_mt8195_scp_adsp, diff --git a/drivers/clk/mediatek/clk-mt8195-vdec.c b/drivers/clk/mediatek/clk-mt8195-vdec.c index a1df04f42a90..a1446b666385 100644 --- a/drivers/clk/mediatek/clk-mt8195-vdec.c +++ b/drivers/clk/mediatek/clk-mt8195-vdec.c @@ -96,6 +96,7 @@ static const struct of_device_id of_match_clk_mt8195_vdec[] = { static struct platform_driver clk_mt8195_vdec_drv = { .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8195-vdec", .of_match_table = of_match_clk_mt8195_vdec, diff --git a/drivers/clk/mediatek/clk-mt8195-venc.c b/drivers/clk/mediatek/clk-mt8195-venc.c index 7339851a0856..622f57804f96 100644 --- a/drivers/clk/mediatek/clk-mt8195-venc.c +++ b/drivers/clk/mediatek/clk-mt8195-venc.c @@ -61,6 +61,7 @@ static const struct of_device_id of_match_clk_mt8195_venc[] = { static struct platform_driver clk_mt8195_venc_drv = { .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8195-venc", .of_match_table = of_match_clk_mt8195_venc, diff --git a/drivers/clk/mediatek/clk-mt8195-vpp0.c b/drivers/clk/mediatek/clk-mt8195-vpp0.c index c3241466a8d0..bf2939c3a023 100644 --- a/drivers/clk/mediatek/clk-mt8195-vpp0.c +++ b/drivers/clk/mediatek/clk-mt8195-vpp0.c @@ -102,6 +102,7 @@ static const struct of_device_id of_match_clk_mt8195_vpp0[] = { static struct platform_driver clk_mt8195_vpp0_drv = { .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8195-vpp0", .of_match_table = of_match_clk_mt8195_vpp0, diff --git a/drivers/clk/mediatek/clk-mt8195-vpp1.c b/drivers/clk/mediatek/clk-mt8195-vpp1.c index ce0b9a40a179..ffd52c762890 100644 --- a/drivers/clk/mediatek/clk-mt8195-vpp1.c +++ b/drivers/clk/mediatek/clk-mt8195-vpp1.c @@ -100,6 +100,7 @@ static const struct of_device_id of_match_clk_mt8195_vpp1[] = { static struct platform_driver clk_mt8195_vpp1_drv = { .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8195-vpp1", .of_match_table = of_match_clk_mt8195_vpp1, diff --git a/drivers/clk/mediatek/clk-mt8195-wpe.c b/drivers/clk/mediatek/clk-mt8195-wpe.c index 274d60838d8e..b483fab10e18 100644 --- a/drivers/clk/mediatek/clk-mt8195-wpe.c +++ b/drivers/clk/mediatek/clk-mt8195-wpe.c @@ -135,6 +135,7 @@ static const struct of_device_id of_match_clk_mt8195_wpe[] = { static struct platform_driver clk_mt8195_wpe_drv = { .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8195-wpe", .of_match_table = of_match_clk_mt8195_wpe,