Skip to contentSkip to conversation

iommu/msm: Use platform_register/unregister_drivers()

PATCH Applied Thierry Reding 2 participants 2 messages Dec 2, 2015 – Dec 14, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iommu/msm: Use platform_register/unregister_drivers()

From: Thierry Reding <[email protected]>

These new helpers simplify implementing multi-driver modules and properly handle failure to register one driver by unregistering all previously registered drivers.

---
 drivers/iommu/msm_iommu_dev.c | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)
drivers/iommu/msm_iommu_dev.c +7 -18
index b6d01f97e537..4b09e815accf 100644
@@ -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);
Signature · 1 line
2.5.0
maintainer Applied
#1 lore raw
Quoted 10 lines · Thierry Reding

From: Thierry Reding <[email protected]>

These new helpers simplify implementing multi-driver modules and properly handle failure to register one driver by unregistering all previously registered drivers.

---
 drivers/iommu/msm_iommu_dev.c | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

Applied, thanks.