ARM: OMAP2+: Remove device creation for omap-pcm-audio
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Fri, 11 Dec 2015 12:50:20 +0000 (14:50 +0200)
committerTony Lindgren <tony@atomide.com>
Thu, 17 Dec 2015 18:34:41 +0000 (10:34 -0800)
The omap-pcm in ASoC is no longer a platform device. No need to create this
device anymore.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/devices.c

index 9374da3..9cda974 100644 (file)
@@ -94,22 +94,6 @@ static inline void omap_init_mbox(void) { }
 
 static inline void omap_init_sti(void) {}
 
-#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)
-
-static struct platform_device omap_pcm = {
-       .name   = "omap-pcm-audio",
-       .id     = -1,
-};
-
-static void omap_init_audio(void)
-{
-       platform_device_register(&omap_pcm);
-}
-
-#else
-static inline void omap_init_audio(void) {}
-#endif
-
 #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
 
 #include <linux/platform_data/spi-omap2-mcspi.h>
@@ -239,13 +223,12 @@ static int __init omap2_init_devices(void)
        if (!of_have_populated_dt())
                pinctrl_provide_dummies();
 
-       /*
-        * please keep these calls, and their implementations above,
-        * in alphabetical order so they're easier to sort through.
-        */
-       omap_init_audio();
        /* If dtb is there, the devices will be created dynamically */
        if (!of_have_populated_dt()) {
+               /*
+                * 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();