Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 228e5fad authored by Suman Anna's avatar Suman Anna Committed by Tony Lindgren
Browse files

ARM: OMAP2+: Remove module references from IOMMU machine layer 



The OMAP IOMMU driver has been adapted to the IOMMU framework
for a while now, and it no longer supports being built as a
module. Cleanup all the module related references both from
the code and in the build.

While at it, also relocate a comment around the initcall to
avoid a checkpatch strict warning about using a blank line
after function/struct/union/enum declarations.

Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ea827ad5

arch/arm/mach-omap2/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -234,8 +234,7 @@ obj-$(CONFIG_SOC_DRA7XX) += omap_hwmod_7xx_data.o 
# EMU peripherals

obj-$(CONFIG_HW_PERF_EVENTS)		+= pmu.o



iommu-$(CONFIG_OMAP_IOMMU)		:= omap-iommu.o

obj-y					+= $(iommu-m) $(iommu-y)

obj-$(CONFIG_OMAP_IOMMU)		+= omap-iommu.o



# OMAP2420 MSDI controller integration support ("MMC")

obj-$(CONFIG_SOC_OMAP2420)		+= msdi.o

arch/arm/mach-omap2/omap-iommu.c

+1 −12
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
 */



#include <linux/of.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/err.h>

#include <linux/slab.h>
@@ -63,15 +62,5 @@ static int __init omap_iommu_init(void) 


	return omap_hwmod_for_each_by_class("mmu", omap_iommu_dev_init, NULL);

}

/* must be ready before omap3isp is probed */

omap_subsys_initcall(omap_iommu_init);



static void __exit omap_iommu_exit(void)

{

	/* Do nothing */

}

module_exit(omap_iommu_exit);



MODULE_AUTHOR("Hiroshi DOYU");

MODULE_DESCRIPTION("omap iommu: omap device registration");

MODULE_LICENSE("GPL v2");
 
/* must be ready before omap3isp is probed */