Skip to content

Commit

Permalink
iommu/msm: Use platform_register/unregister_drivers()
Browse files Browse the repository at this point in the history
These new helpers simplify implementing multi-driver modules and
properly handle failure to register one driver by unregistering all
previously registered drivers.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
  • Loading branch information
Thierry Reding authored and Joerg Roedel committed Dec 14, 2015
1 parent 9f9499a commit e7479a1
Showing 1 changed file with 7 additions and 18 deletions.
25 changes: 7 additions & 18 deletions drivers/iommu/msm_iommu_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -359,30 +359,19 @@ static struct platform_driver msm_iommu_ctx_driver = {
.remove = msm_iommu_ctx_remove,
};

static struct platform_driver * const drivers[] = {
&msm_iommu_driver,
&msm_iommu_ctx_driver,
};

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");
goto error;
}

ret = platform_driver_register(&msm_iommu_ctx_driver);
if (ret != 0) {
platform_driver_unregister(&msm_iommu_driver);
pr_err("Failed to register IOMMU context driver\n");
goto error;
}

error:
return ret;
return platform_register_drivers(drivers, ARRAY_SIZE(drivers));
}

static void __exit msm_iommu_driver_exit(void)
{
platform_driver_unregister(&msm_iommu_ctx_driver);
platform_driver_unregister(&msm_iommu_driver);
platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));
}

subsys_initcall(msm_iommu_driver_init);
Expand Down

0 comments on commit e7479a1

Please sign in to comment.