[PATCH] ARM: OMAP: rework mutex_init() for RT compatibility

Replace remaining __MUTEX_INITIALIZER() calls with mutex_init() to
enable compatibility with the realtime-preempt patchset.

Signed-off-by: Kevin Hilman <khilman@deeprooted.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 20e513f0b98c48659ee316d844ee7cbaa094d4ff..10d378756acd3add03fffd15e574b0202ac750e6 100644 (file)
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -156,6 +156,7 @@ static struct platform_device h4_smc91x_device = {
 
 /* Select between the IrDA and aGPS module
  */
+#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
 static int h4_select_irda(struct device *dev, int state)
 {
        unsigned char expa;
@@ -212,6 +213,10 @@ static int h4_transceiver_mode(struct device *dev, int mode)
 
        return 0;
 }
+#else
+static int h4_select_irda(struct device *dev, int state) { return 0; }
+static int h4_transceiver_mode(struct device *dev, int mode) { return 0; }
+#endif
 
 static struct omap_irda_config h4_irda_data = {
        .transceiver_cap        = IR_SIRMODE | IR_MIRMODE | IR_FIRMODE,

diff --git a/arch/arm/plat-omap/dsp/dsp_common.c b/arch/arm/plat-omap/dsp/dsp_common.c
index 2117a24327193842f928d31dd938da8fc63c688e..ae0eaaee4836c4bd69574a03fdf8ae26a0eb8513 100644 (file)
--- a/arch/arm/plat-omap/dsp/dsp_common.c
+++ b/arch/arm/plat-omap/dsp/dsp_common.c
@@ -59,7 +59,6 @@ struct cpustat {
        void (*mem_rel_cb)(void);
 };
 struct cpustat cpustat = {
-       .lock = __MUTEX_INITIALIZER(cpustat.lock),
        .stat = CPUSTAT_RESET,
        .icrmask = 0xffff,
 };
@@ -243,6 +242,8 @@ static int init_done;
 
 static int __init omap_dsp_init(void)
 {
+       mutex_init(&cpustat.lock);
+
        dspmem_size = 0;
 #ifdef CONFIG_ARCH_OMAP15XX
        if (cpu_is_omap1510()) {

diff --git a/sound/oss/omap-audio-aic23.c b/sound/oss/omap-audio-aic23.c
index 1e41b1d4d3290a1747fccb003bfbf44403e0055b..0ecb2f77c6796649553b08eaf0d948945de79414 100644 (file)
--- a/sound/oss/omap-audio-aic23.c
+++ b/sound/oss/omap-audio-aic23.c
@@ -244,7 +244,6 @@ static audio_state_t aic23_state = {
         .hw_remove      =  __exit_p(omap_aic23_remove),
         .hw_suspend     = omap_aic23_suspend,
         .hw_resume      = omap_aic23_resume,
-       .mutex      = __MUTEX_INITIALIZER(aic23_state.mutex),
 };
 
 /* This will be defined in the audio.h */
@@ -673,6 +672,8 @@ static int __init audio_aic23_init(void)
        if (machine_is_omap_h2() || machine_is_omap_h3())
                return -ENODEV;
 
+       mutex_init(&aic23_state.mutex);
+
         if (machine_is_omap_osk()) {
                 /* Set MCLK to be clock input for AIC23 */
                 aic23_mclk = clk_get(0, "mclk");

diff --git a/sound/oss/omap-audio-tsc2101.c b/sound/oss/omap-audio-tsc2101.c
index f8e6dacf1ff79609cac92972ecc4aa28f0abe50d..cbabcf59ad97ec5de0eed1704c4adbd25e268584 100644 (file)
--- a/sound/oss/omap-audio-tsc2101.c
+++ b/sound/oss/omap-audio-tsc2101.c
@@ -326,7 +326,6 @@ static audio_state_t tsc2101_state = {
        .hw_remove      = omap_tsc2101_remove,
        .hw_suspend     = omap_tsc2101_suspend,
        .hw_resume      = omap_tsc2101_resume,
-       .mutex          = __MUTEX_INITIALIZER(tsc2101_state.mutex),
 };
 
 /* This will be defined in the Audio.h */
@@ -1031,6 +1030,8 @@ static int __init audio_tsc2101_init(void)
        if (machine_is_omap_osk() || machine_is_omap_innovator())
                return -ENODEV;
 
+       mutex_init(&tsc2101_state.mutex);
+
        /* register the codec with the audio driver */
        if ((err = audio_register_codec(&tsc2101_state))) {
                printk(KERN_ERR