Skip to content

Commit f295cf2

Browse files
Paul Gortmakerjoergroedel
authored andcommitted
iommu/qcom: Make it explicitly non-modular
The Kconfig currently controlling compilation of this code is: drivers/iommu/Kconfig:config MTK_IOMMU_V1 drivers/iommu/Kconfig: bool "MTK IOMMU Version 1 (M4U gen1) Support" ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. Since module_init just becomes device_initcall for non-modules, the init ordering remains unchanged with this commit. Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments. Cc: Rob Clark <robdclark@gmail.com> Cc: Joerg Roedel <joro@8bytes.org> Cc: iommu@lists.linux-foundation.org Cc: linux-arm-msm@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent 8128ac3 commit f295cf2

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

drivers/iommu/qcom_iommu.c

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <linux/iommu.h>
3030
#include <linux/iopoll.h>
3131
#include <linux/kconfig.h>
32-
#include <linux/module.h>
32+
#include <linux/init.h>
3333
#include <linux/mutex.h>
3434
#include <linux/of.h>
3535
#include <linux/of_address.h>
@@ -908,7 +908,6 @@ static const struct of_device_id qcom_iommu_of_match[] = {
908908
{ .compatible = "qcom,msm-iommu-v1" },
909909
{ /* sentinel */ }
910910
};
911-
MODULE_DEVICE_TABLE(of, qcom_iommu_of_match);
912911

913912
static struct platform_driver qcom_iommu_driver = {
914913
.driver = {
@@ -934,15 +933,4 @@ static int __init qcom_iommu_init(void)
934933

935934
return ret;
936935
}
937-
938-
static void __exit qcom_iommu_exit(void)
939-
{
940-
platform_driver_unregister(&qcom_iommu_driver);
941-
platform_driver_unregister(&qcom_iommu_ctx_driver);
942-
}
943-
944-
module_init(qcom_iommu_init);
945-
module_exit(qcom_iommu_exit);
946-
947-
MODULE_DESCRIPTION("IOMMU API for QCOM IOMMU v1 implementations");
948-
MODULE_LICENSE("GPL v2");
936+
device_initcall(qcom_iommu_init);

0 commit comments

Comments
 (0)