Skip to content

Commit

Permalink
staging: tidspbridge: Remove cfg_get_auto_start()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ivan Gomez Castellanos authored and Greg Kroah-Hartman committed Aug 31, 2010
1 parent 27e7f23 commit 4a65956
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 49 deletions.
19 changes: 0 additions & 19 deletions drivers/staging/tidspbridge/include/dspbridge/cfg.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,6 @@
*/
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:
Expand Down
10 changes: 6 additions & 4 deletions drivers/staging/tidspbridge/pmgr/dspapi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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;
Expand Down
26 changes: 0 additions & 26 deletions drivers/staging/tidspbridge/services/cfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 4a65956

Please sign in to comment.