ARM: OMAP1: Move omap_init_audio() to keep the devices in alphabetical order (fcc76a85) · Commits · 戴 / test

arch/arm/mach-omap1/devices.c

+17 −19

Original line number	Diff line number	Diff line
		@@ -31,6 +31,22 @@
		#include "common.h"
		#include "clock.h"

		#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_RTC_DRV_OMAP) \|\| defined(CONFIG_RTC_DRV_OMAP_MODULE)
		@@ -242,24 +258,6 @@ void __init omap1_camera_init(void *info)

		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

		/-------------------------------------------------------------------------/

		/*
		* This gets called after board-specific INIT_MACHINE, and initializes most
		* on-chip peripherals accessible on this board (except for few like USB):
		@@ -292,11 +290,11 @@ static int __init omap1_init_devices(void)
		* in alphabetical order so they're easier to sort through.
		*/

		omap_init_audio();
		omap_init_mbox();
		omap_init_rtc();
		omap_init_spi100k();
		omap_init_sti();
		omap_init_audio();

		return 0;
		}