]> Pileus Git - ~andy/linux/commitdiff
staging: tidspbridge: Remove cfg_get_auto_start()
authorIvan Gomez Castellanos <ivan.gomez@ti.com>
Wed, 25 Aug 2010 22:08:56 +0000 (17:08 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 31 Aug 2010 18:23:14 +0000 (11:23 -0700)
As the services directory is going to be removed, this patch is needed.

The function cfg_get_auto_start() only assigns a value to the flag
tmp, and it is only called by the function api_init_complete2(). So
the function cfg_get_auto_start() is not required.

Signed-off-by: Ivan Gomez Castellanos <ivan.gomez@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/tidspbridge/include/dspbridge/cfg.h
drivers/staging/tidspbridge/pmgr/dspapi.c
drivers/staging/tidspbridge/services/cfg.c

index 05a8999070f83ec4faccd93eae8bf0aa36a3e0dc..a84fa2b084b0a9f789d205340b27267c06c67bf2 100644 (file)
  */
 extern void cfg_exit(void);
 
-/*
- *  ======== cfg_get_auto_start ========
- *  Purpose:
- *      Retreive the autostart mask, if any, for this board.
- *  Parameters:
- *      dev_node_obj:  Handle to the dev_node who's driver we are querying.
- *      auto_start:   Ptr to location for 32 bit autostart mask.
- *  Returns:
- *      0:                Success.
- *      -EFAULT:  dev_node_obj is invalid.
- *      -ENODATA: Unable to retreive resource.
- *  Requires:
- *      CFG initialized.
- *  Ensures:
- *      0:        *auto_start contains autostart mask for this devnode.
- */
-extern int cfg_get_auto_start(struct cfg_devnode *dev_node_obj,
-                                    u32 *auto_start);
-
 /*
  *  ======== cfg_get_cd_version ========
  *  Purpose:
index 7b42f72a97b2d16a42e1bf6548db3f36887a5a8f..d9bb3ea92afc843b62fa77b91ccb59b06f43c835 100644 (file)
@@ -381,8 +381,8 @@ int api_init_complete2(void)
        int status = 0;
        struct cfg_devnode *dev_node;
        struct dev_object *hdev_obj;
+       struct drv_data *drv_datap;
        u8 dev_type;
-       u32 tmp;
 
        DBC_REQUIRE(api_c_refs > 0);
 
@@ -397,10 +397,12 @@ int api_init_complete2(void)
                if (dev_get_dev_type(hdev_obj, &dev_type))
                        continue;
 
-               if ((dev_type == DSP_UNIT) || (dev_type == IVA_UNIT))
-                       if (cfg_get_auto_start(dev_node, &tmp) == 0
-                                                                       && tmp)
+               if ((dev_type == DSP_UNIT) || (dev_type == IVA_UNIT)) {
+                       drv_datap = dev_get_drvdata(bridge);
+
+                       if (drv_datap && drv_datap->base_img)
                                proc_auto_start(dev_node, hdev_obj);
+               }
        }
 
        return status;
index a7af74f482dd8df0257d88e8eaf9299288b79896..e9cdbf6d36b11df96f744b3ad7d9613897cdc90e 100644 (file)
@@ -45,32 +45,6 @@ void cfg_exit(void)
        /* Do nothing */
 }
 
-/*
- *  ======== cfg_get_auto_start ========
- *  Purpose:
- *      Retreive the autostart mask, if any, for this board.
- */
-int cfg_get_auto_start(struct cfg_devnode *dev_node_obj,
-                             u32 *auto_start)
-{
-       int status = 0;
-       u32 dw_buf_size;
-       struct drv_data *drv_datap = dev_get_drvdata(bridge);
-
-       dw_buf_size = sizeof(*auto_start);
-       if (!dev_node_obj)
-               status = -EFAULT;
-       if (!auto_start || !drv_datap)
-               status = -EFAULT;
-       if (!status)
-               *auto_start = (drv_datap->base_img) ? 1 : 0;
-
-       DBC_ENSURE((status == 0 &&
-                   (*auto_start == 0 || *auto_start == 1))
-                  || status != 0);
-       return status;
-}
-
 /*
  *  ======== cfg_get_dev_object ========
  *  Purpose: