DSPGW: Remove CONFIG_OMAP_DSP_TASK_MULTIOPEN

This MULTIOPEN feature should always be enabled.

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/plat-omap/dsp/Kconfig b/arch/arm/plat-omap/dsp/Kconfig
index 0d62beee8a39ca60e43489b820fb20e19ba157cc..122164abbf9dff316cb125e7e6d2b58332e58947 100644 (file)
--- a/arch/arm/plat-omap/dsp/Kconfig
+++ b/arch/arm/plat-omap/dsp/Kconfig
@@ -14,13 +14,6 @@ config OMAP_DSP_MBCMD_VERBOSE
           This enables kernel log output in the Mailbox command exchanges
          in the DSP Gateway driver.
 
           This enables kernel log output in the Mailbox command exchanges
          in the DSP Gateway driver.
 

-config OMAP_DSP_TASK_MULTIOPEN
-       bool "DSP Task Multiopen Capability"
-       depends on OMAP_DSP
-       help
-          This enables DSP tasks to be opened by multiple times at a time.
-         Otherwise, they can be opened only once at a time.
-

 config OMAP_DSP_FBEXPORT
        bool "Framebuffer export to DSP"
        depends on OMAP_DSP && FB
 config OMAP_DSP_FBEXPORT
        bool "Framebuffer export to DSP"
        depends on OMAP_DSP && FB

diff --git a/arch/arm/plat-omap/dsp/task.c b/arch/arm/plat-omap/dsp/task.c
index f2ccbdf8be9b57340ea46abe1ee280627333acbe..b43f70409928bfe063dcc97bc220da88fd5c4c70 100644 (file)
--- a/arch/arm/plat-omap/dsp/task.c
+++ b/arch/arm/plat-omap/dsp/task.c
@@ -1453,13 +1453,6 @@ static int dsp_task_open(struct inode *inode, struct file *file)
        }
 
  attached:
        }
 
  attached:

-       /* ATTACHED */
-#ifndef CONFIG_OMAP_DSP_TASK_MULTIOPEN
-       if (dev->usecount > 0) {
-               up_write(&dev->state_sem);
-               return -EBUSY;
-       }
-#endif

        ret = proc_list_add(&dev->proc_list_lock,
                            &dev->proc_list, current, file);
        if (ret)
        ret = proc_list_add(&dev->proc_list_lock,
                            &dev->proc_list, current, file);
        if (ret)