staging: tidspbridge: remove unused code to handle iva_img

There is no way to specify the value of iva_img and since this code
is not being used, remove it.

This analysis resulted from a report by
Chen Gang <gang.chen@asianux.com>, mentioning that the existing code
was wrongly specifying the size to be copied.

Signed-off-by: Omar Ramirez Luna <omar.ramirez@copitl.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/tidspbridge/include/dspbridge/proc.h b/drivers/staging/tidspbridge/include/dspbridge/proc.h
index 851b356d7a51a24f47ac5959f500bd0fad8a8454..774a3f6ff2011c4fb1a0c791855a463f6a8c92fb 100644 (file)
--- a/drivers/staging/tidspbridge/include/dspbridge/proc.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/proc.h
@@ -23,8 +23,6 @@
 #include <dspbridge/devdefs.h>
 #include <dspbridge/drv.h>
 
-extern char *iva_img;
-
 /*
  *  ======== proc_attach ========
  *  Purpose:

diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c
index e6f31d817d6b8b0988419b0d21f9c6851a84b9a1..df0f37ea1ee50bf765680edba66ac1292ccc4c6b 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/drv_interface.c
+++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c
@@ -65,7 +65,6 @@ static struct class *bridge_class;
 static u32 driver_context;
 static s32 driver_major;
 static char *base_img;
-char *iva_img;
 static s32 shm_size = 0x500000;        /* 5 MB */
 static int tc_wordswapon;      /* Default value is always false */
 #ifdef CONFIG_TIDSPBRIDGE_RECOVERY

diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c
index ac016edc579fd2bb3027831177560dbad93216ca..e1bdf6eacb3a4996afeef38e3fc1ffcd4e82caba 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/proc.c
+++ b/drivers/staging/tidspbridge/rmgr/proc.c
@@ -382,7 +382,6 @@ static int get_exec_file(struct cfg_devnode *dev_node_obj,
                                u32 size, char *exec_file)
 {
        u8 dev_type;
-       s32 len;
        struct drv_data *drv_datap = dev_get_drvdata(bridge);
 
        dev_get_dev_type(hdev_obj, (u8 *) &dev_type);
@@ -398,9 +397,6 @@ static int get_exec_file(struct cfg_devnode *dev_node_obj,
                        return -EINVAL;
 
                strcpy(exec_file, drv_datap->base_img);
-       } else if (dev_type == IVA_UNIT && iva_img) {
-               len = strlen(iva_img);
-               strncpy(exec_file, iva_img, len + 1);
        } else {
                return -ENOENT;
        }