Message ID | 05ca5e1b29bdd350f4e20b9ceb031a2c281e23d2.1644005728.git.robin.murphy@arm.com |
---|---|
State | Accepted |
Commit | 6b813e0e48d77bc026aaea6683fc6e74f5695ab4 |
Headers | show |
Series | iommu/msm: Use standard driver registration | expand |
Am Freitag, 4. Februar 2022, 21:16:41 CET schrieb Robin Murphy: > It's been a long time since there was any reason to register IOMMU > drivers early. Convert to the standard platform driver helper. > > CC: Heiko Stuebner <heiko@sntech.de> > Signed-off-by: Robin Murphy <robin.murphy@arm.com> Reviewed-by: Heiko Stuebner <heiko@sntech.de> > --- > drivers/iommu/rockchip-iommu.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c > index 7f23ad61c094..204a93a72572 100644 > --- a/drivers/iommu/rockchip-iommu.c > +++ b/drivers/iommu/rockchip-iommu.c > @@ -1407,9 +1407,4 @@ static struct platform_driver rk_iommu_driver = { > .suppress_bind_attrs = true, > }, > }; > - > -static int __init rk_iommu_init(void) > -{ > - return platform_driver_register(&rk_iommu_driver); > -} > -subsys_initcall(rk_iommu_init); > +builtin_platform_driver(rk_iommu_driver); >
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c index 3a38352b603f..06bde6b66732 100644 --- a/drivers/iommu/msm_iommu.c +++ b/drivers/iommu/msm_iommu.c @@ -831,16 +831,4 @@ static struct platform_driver msm_iommu_driver = { .probe = msm_iommu_probe, .remove = msm_iommu_remove, }; - -static int __init msm_iommu_driver_init(void) -{ - int ret; - - ret = platform_driver_register(&msm_iommu_driver); - if (ret != 0) - pr_err("Failed to register IOMMU driver\n"); - - return ret; -} -subsys_initcall(msm_iommu_driver_init); - +builtin_platform_driver(msm_iommu_driver);
It's been a long time since there was any reason to register IOMMU drivers early. Convert to the standard platform driver helper. CC: Andy Gross <agross@kernel.org> CC: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- drivers/iommu/msm_iommu.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)