1 files changed, 0 insertions, 28 deletions

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 9cda974a3009..d7f1d69daf6d 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -18,7 +18,6 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/pinctrl/machine.h>
-#include <linux/platform_data/mailbox-omap.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
@@ -66,32 +65,6 @@ static int __init omap3_l3_init(void)
 }
 omap_postcore_initcall(omap3_l3_init);
 
-#if defined(CONFIG_OMAP2PLUS_MBOX) || defined(CONFIG_OMAP2PLUS_MBOX_MODULE)
-static inline void __init omap_init_mbox(void)
-{
-        struct omap_hwmod *oh;
-        struct platform_device *pdev;
-        struct omap_mbox_pdata *pdata;
-
-        oh = omap_hwmod_lookup("mailbox");
-        if (!oh) {
-                pr_err("%s: unable to find hwmod\n", __func__);
-                return;
-        }
-        if (!oh->dev_attr) {
-                pr_err("%s: hwmod doesn't have valid attrs\n", __func__);
-                return;
-        }
-
-        pdata = (struct omap_mbox_pdata *)oh->dev_attr;
-        pdev = omap_device_build("omap-mailbox", -1, oh, pdata, sizeof(*pdata));
-        WARN(IS_ERR(pdev), "%s: could not build device, err %ld\n",
-                                                __func__, PTR_ERR(pdev));
-}
-#else
-static inline void omap_init_mbox(void) { }
-#endif /* CONFIG_OMAP2PLUS_MBOX */
-
 static inline void omap_init_sti(void) {}
 
 #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
@@ -229,7 +202,6 @@ static int __init omap2_init_devices(void)
                  * please keep these calls, and their implementations above,
                  * in alphabetical order so they're easier to sort through.
                  */
-                omap_init_mbox();
                 omap_init_mcspi();
                 omap_init_sham();
                 omap_init_aes();