leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: tidspbridge: Remove cfg_set_dev_object()

Browse Source 
As the services directory is going to be removed, the cfg_set_dev_object
function has also to be removed.

Signed-off-by: Ivan Gomez Castellanos <ivan.gomez@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Ivan Gomez Castellanos 2010-08-25 17:09:01 -05:00 committed by Greg Kroah-Hartman
parent 73b87a9166
commit a47d4deebf
3 changed files with 16 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/tidspbridge/include/dspbridge/cfg.h
View File

@ -78,25 +78,6 @@ extern void cfg_get_perf_value(bool *enable_perf);
extern int cfg_get_zl_file(struct cfg_devnode *dev_node_obj,
u32 buf_size, char *str_zl_file_name);
/*
* ======== cfg_set_dev_object ========
* Purpose:
* Store the Device Object handle for a given devnode.
* Parameters:
* dev_node_obj: Platform's dev_node handle we are storing value with.
* value: Arbitrary value to store.
* Returns:
* 0: Success.
* -EFAULT: dev_node_obj is invalid.
* -EPERM: Internal Error.
* Requires:
* CFG initialized.
* Ensures:
* 0: The Private u32 was successfully set.
*/
extern int cfg_set_dev_object(struct cfg_devnode *dev_node_obj,
u32 value);
/*
* ======== CFG_SetDrvObject ========
* Purpose:

28
drivers/staging/tidspbridge/pmgr/dev.c
View File

@ -898,6 +898,7 @@ int dev_start_device(struct cfg_devnode *dev_node_obj)
char bridge_file_name[CFG_MAXSEARCHPATHLEN] = "UMA";
int status;
struct mgr_object *hmgr_obj = NULL;
struct drv_data *drv_datap = dev_get_drvdata(bridge);
DBC_REQUIRE(refs > 0);
@ -906,24 +907,27 @@ int dev_start_device(struct cfg_devnode *dev_node_obj)
dev_node_obj);
if (!status) {
/* Store away the hdev_obj with the DEVNODE */
status = cfg_set_dev_object(dev_node_obj, (u32) hdev_obj);
if (!drv_datap || !dev_node_obj) {
status = -EFAULT;
pr_err("%s: Failed, status 0x%x\n", __func__, status);
} else if (!(strcmp((char *)dev_node_obj, "TIOMAP1510"))) {
drv_datap->dev_object = (void *) hdev_obj;
}
if (!status) {
/* Create the Manager Object */
status = mgr_create(&hmgr_obj, dev_node_obj);
if (status && !(strcmp((char *)dev_node_obj,
"TIOMAP1510"))) {
/* Ensure the device extension is NULL */
drv_datap->dev_object = NULL;
}
}
if (status) {
/* Clean up */
dev_destroy_device(hdev_obj);
hdev_obj = NULL;
}
}
if (!status) {
/* Create the Manager Object */
status = mgr_create(&hmgr_obj, dev_node_obj);
}
if (status) {
if (hdev_obj)
dev_destroy_device(hdev_obj);
/* Ensure the device extension is NULL */
cfg_set_dev_object(dev_node_obj, 0L);
}
return status;
}

30
drivers/staging/tidspbridge/services/cfg.c
View File

@ -30,36 +30,6 @@
#include <dspbridge/cfg.h>
#include <dspbridge/drv.h>
/*
* ======== cfg_set_dev_object ========
* Purpose:
* Store the Device Object handle and dev_node pointer for a given devnode.
*/
int cfg_set_dev_object(struct cfg_devnode *dev_node_obj, u32 value)
{
int status = 0;
struct drv_data *drv_datap = dev_get_drvdata(bridge);
if (!drv_datap) {
pr_err("%s: Failed, status 0x%x\n", __func__, status);
return -EPERM;
}
if (!dev_node_obj)
status = -EFAULT;
if (!status) {
/* Store the Bridge device object in the Registry */
if (!(strcmp((char *)dev_node_obj, "TIOMAP1510")))
drv_datap->dev_object = (void *) value;
}
if (status)
pr_err("%s: Failed, status 0x%x\n", __func__, status);
return status;
}
/*
* ======== cfg_set_object ========
* Purpose: