staging: tidspbridge: Remove cfg_get_object()

As the services directory is going to be removed, the cfg_get_object
function has also to be removed.

Since the driver object handle is retrieved from the drv_data structure,
then the word "Registry" is replaced by "driver data" in the comments.

Also, the hdrv_obj is not used in function omap34_xx_bridge_remove(), so
it is removed.

Signed-off-by: Ivan Gomez Castellanos <ivan.gomez@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/tidspbridge/include/dspbridge/cfg.h b/drivers/staging/tidspbridge/include/dspbridge/cfg.h
index 11f5bdebae7058c5a4e529476fba75295550c54f..834b25b4d95d1dc0077abefa1727333425476854 100644 (file)
--- a/drivers/staging/tidspbridge/include/dspbridge/cfg.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cfg.h
@@ -40,23 +40,6 @@
  */
 extern int cfg_get_cd_version(u32 *version);
 
-/*
- *  ======== cfg_get_object ========
- *  Purpose:
- *      Retrieve the Driver Object handle From the Registry
- *  Parameters:
- *      value:      Ptr to location to store the value.
- *      dw_type      Type of Object to Get
- *  Returns:
- *      0:    Success.
- *  Requires:
- *      CFG initialized.
- *  Ensures:
- *      0:    *value is set to the retrieved u32(non-Zero).
- *      else:       *value is set to 0L.
- */
-extern int cfg_get_object(u32 *value, u8 dw_type);
-
 /*
  *  ======== cfg_get_perf_value ========
  *  Purpose:

diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c
index 7893f9a0cf0eb5e78df04c76775089205b55f315..8077bdce74946f11117ce0b446dd253b4b3e40e8 100644 (file)
--- a/drivers/staging/tidspbridge/pmgr/dev.c
+++ b/drivers/staging/tidspbridge/pmgr/dev.c
@@ -148,6 +148,7 @@ int dev_create_device(struct dev_object **device_obj,
        struct io_attrs io_mgr_attrs;
        u32 num_windows;
        struct drv_object *hdrv_obj = NULL;
+       struct drv_data *drv_datap = dev_get_drvdata(bridge);
        int status = 0;
        DBC_REQUIRE(refs > 0);
        DBC_REQUIRE(device_obj != NULL);
@@ -163,10 +164,15 @@ int dev_create_device(struct dev_object **device_obj,
 
        /*  Get the Bridge driver interface functions */
        bridge_drv_entry(&drv_fxns, driver_file_name);
-       if (cfg_get_object((u32 *) &hdrv_obj, REG_DRV_OBJECT)) {
-               /* don't propogate CFG errors from this PROC function */
+
+       /* Retrieve the Object handle from the driver data */
+       if (drv_datap && drv_datap->drv_object) {
+               hdrv_obj = drv_datap->drv_object;
+       } else {
                status = -EPERM;
+               pr_err("%s: Failed to retrieve the object handle\n", __func__);
        }
+
        /* Create the device object, and pass a handle to the Bridge driver for
         * storage. */
        if (!status) {

diff --git a/drivers/staging/tidspbridge/rmgr/drv.c b/drivers/staging/tidspbridge/rmgr/drv.c
index 8a8dea6efeda8d8b1b52f48d2d36235ef4ff97d4..fc1f49b61df915ed7460ea842096026fd2366dff 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/drv.c
+++ b/drivers/staging/tidspbridge/rmgr/drv.c
@@ -438,11 +438,15 @@ u32 drv_get_first_dev_object(void)
 {
        u32 dw_dev_object = 0;
        struct drv_object *pdrv_obj;
+       struct drv_data *drv_datap = dev_get_drvdata(bridge);
 
-       if (!cfg_get_object((u32 *) &pdrv_obj, REG_DRV_OBJECT)) {
+       if (drv_datap && drv_datap->drv_object) {
+               pdrv_obj = drv_datap->drv_object;
                if ((pdrv_obj->dev_list != NULL) &&
                    !LST_IS_EMPTY(pdrv_obj->dev_list))
                        dw_dev_object = (u32) lst_first(pdrv_obj->dev_list);
+       } else {
+               pr_err("%s: Failed to retrieve the object handle\n", __func__);
        }
 
        return dw_dev_object;
@@ -458,14 +462,17 @@ u32 drv_get_first_dev_extension(void)
 {
        u32 dw_dev_extension = 0;
        struct drv_object *pdrv_obj;
+       struct drv_data *drv_datap = dev_get_drvdata(bridge);
 
-       if (!cfg_get_object((u32 *) &pdrv_obj, REG_DRV_OBJECT)) {
-
+       if (drv_datap && drv_datap->drv_object) {
+               pdrv_obj = drv_datap->drv_object;
                if ((pdrv_obj->dev_node_string != NULL) &&
                    !LST_IS_EMPTY(pdrv_obj->dev_node_string)) {
                        dw_dev_extension =
                            (u32) lst_first(pdrv_obj->dev_node_string);
                }
+       } else {
+               pr_err("%s: Failed to retrieve the object handle\n", __func__);
        }
 
        return dw_dev_extension;
@@ -482,18 +489,22 @@ u32 drv_get_next_dev_object(u32 hdev_obj)
 {
        u32 dw_next_dev_object = 0;
        struct drv_object *pdrv_obj;
+       struct drv_data *drv_datap = dev_get_drvdata(bridge);
 
        DBC_REQUIRE(hdev_obj != 0);
 
-       if (!cfg_get_object((u32 *) &pdrv_obj, REG_DRV_OBJECT)) {
-
+       if (drv_datap && drv_datap->drv_object) {
+               pdrv_obj = drv_datap->drv_object;
                if ((pdrv_obj->dev_list != NULL) &&
                    !LST_IS_EMPTY(pdrv_obj->dev_list)) {
                        dw_next_dev_object = (u32) lst_next(pdrv_obj->dev_list,
                                                            (struct list_head *)
                                                            hdev_obj);
                }
+       } else {
+               pr_err("%s: Failed to retrieve the object handle\n", __func__);
        }
+
        return dw_next_dev_object;
 }
 
@@ -509,16 +520,20 @@ u32 drv_get_next_dev_extension(u32 dev_extension)
 {
        u32 dw_dev_extension = 0;
        struct drv_object *pdrv_obj;
+       struct drv_data *drv_datap = dev_get_drvdata(bridge);
 
        DBC_REQUIRE(dev_extension != 0);
 
-       if (!cfg_get_object((u32 *) &pdrv_obj, REG_DRV_OBJECT)) {
+       if (drv_datap && drv_datap->drv_object) {
+               pdrv_obj = drv_datap->drv_object;
                if ((pdrv_obj->dev_node_string != NULL) &&
                    !LST_IS_EMPTY(pdrv_obj->dev_node_string)) {
                        dw_dev_extension =
                            (u32) lst_next(pdrv_obj->dev_node_string,
                                           (struct list_head *)dev_extension);
                }
+       } else {
+               pr_err("%s: Failed to retrieve the object handle\n", __func__);
        }
 
        return dw_dev_extension;
@@ -616,6 +631,7 @@ int drv_request_resources(u32 dw_context, u32 *dev_node_strg)
        int status = 0;
        struct drv_object *pdrv_object;
        struct drv_ext *pszdev_node;
+       struct drv_data *drv_datap = dev_get_drvdata(bridge);
 
        DBC_REQUIRE(dw_context != 0);
        DBC_REQUIRE(dev_node_strg != NULL);
@@ -626,7 +642,11 @@ int drv_request_resources(u32 dw_context, u32 *dev_node_strg)
         *  list.
         */
 
-       status = cfg_get_object((u32 *) &pdrv_object, REG_DRV_OBJECT);
+       if (!drv_datap || !drv_datap->drv_object)
+               status = -ENODATA;
+       else
+               pdrv_object = drv_datap->drv_object;
+
        if (!status) {
                pszdev_node = kzalloc(sizeof(struct drv_ext), GFP_KERNEL);
                if (pszdev_node) {

diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c
index 7ee89492a755564ca0947622cc2663a72a5c2d37..3d2045418e4e75bce62ac030615d9e21e6ce31b7 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/drv_interface.c
+++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c
@@ -394,11 +394,14 @@ static int __devexit omap34_xx_bridge_remove(struct platform_device *pdev)
        dev_t devno;
        bool ret;
        int status = 0;
-       void *hdrv_obj = NULL;
+       struct drv_data *drv_datap = dev_get_drvdata(bridge);
 
-       status = cfg_get_object((u32 *) &hdrv_obj, REG_DRV_OBJECT);
-       if (status)
+       /* Retrieve the Object handle from the driver data */
+       if (!drv_datap || !drv_datap->drv_object) {
+               status = -ENODATA;
+               pr_err("%s: Failed to retrieve the object handle\n", __func__);
                goto func_cont;
+       }
 
 #ifdef CONFIG_TIDSPBRIDGE_DVFS
        if (cpufreq_unregister_notifier(&iva_clk_notifier,

diff --git a/drivers/staging/tidspbridge/rmgr/dspdrv.c b/drivers/staging/tidspbridge/rmgr/dspdrv.c
index 714f348f526aa34c602d62ac2938359919dd23ce..2ad291daf82669d4cd7f189ad32bc3600bb2d731 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/dspdrv.c
+++ b/drivers/staging/tidspbridge/rmgr/dspdrv.c
@@ -121,6 +121,7 @@ bool dsp_deinit(u32 device_context)
        bool ret = true;
        u32 device_node;
        struct mgr_object *mgr_obj = NULL;
+       struct drv_data *drv_datap = dev_get_drvdata(bridge);
 
        while ((device_node = drv_get_first_dev_extension()) != 0) {
                (void)dev_remove_device((struct cfg_devnode *)device_node);
@@ -131,10 +132,14 @@ bool dsp_deinit(u32 device_context)
 
        (void)drv_destroy((struct drv_object *)device_context);
 
-       /* Get the Manager Object from Registry
+       /* Get the Manager Object from driver data
         * MGR Destroy will unload the DCD dll */
-       if (!cfg_get_object((u32 *) &mgr_obj, REG_MGR_OBJECT))
+       if (drv_datap && drv_datap->mgr_object) {
+               mgr_obj = drv_datap->mgr_object;
                (void)mgr_destroy(mgr_obj);
+       } else {
+               pr_err("%s: Failed to retrieve the object handle\n", __func__);
+       }
 
        api_exit();
 

diff --git a/drivers/staging/tidspbridge/rmgr/mgr.c b/drivers/staging/tidspbridge/rmgr/mgr.c
index 57a39b9c274b3ca4d5ab69475f1dc789e502b818..c6131c44938ba130b475cdfb341f6a2c659e29df 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/mgr.c
+++ b/drivers/staging/tidspbridge/rmgr/mgr.c
@@ -123,6 +123,7 @@ int mgr_enum_node_info(u32 node_id, struct dsp_ndbprops *pndb_props,
        u32 node_index = 0;
        struct dcd_genericobj gen_obj;
        struct mgr_object *pmgr_obj = NULL;
+       struct drv_data *drv_datap = dev_get_drvdata(bridge);
 
        DBC_REQUIRE(pndb_props != NULL);
        DBC_REQUIRE(pu_num_nodes != NULL);
@@ -130,10 +131,14 @@ int mgr_enum_node_info(u32 node_id, struct dsp_ndbprops *pndb_props,
        DBC_REQUIRE(refs > 0);
 
        *pu_num_nodes = 0;
-       /* Get The Manager Object from the Registry */
-       status = cfg_get_object((u32 *) &pmgr_obj, REG_MGR_OBJECT);
-       if (status)
+       /* Get the Manager Object from the driver data */
+       if (!drv_datap || !drv_datap->mgr_object) {
+               status = -ENODATA;
+               pr_err("%s: Failed to retrieve the object handle\n", __func__);
                goto func_cont;
+       } else {
+               pmgr_obj = drv_datap->mgr_object;
+       }
 
        DBC_ASSERT(pmgr_obj);
        /* Forever loop till we hit failed or no more items in the
@@ -195,6 +200,7 @@ int mgr_enum_processor_info(u32 processor_id,
        struct drv_object *hdrv_obj;
        u8 dev_type;
        struct cfg_devnode *dev_node;
+       struct drv_data *drv_datap = dev_get_drvdata(bridge);
        bool proc_detect = false;
 
        DBC_REQUIRE(processor_info != NULL);
@@ -203,7 +209,15 @@ int mgr_enum_processor_info(u32 processor_id,
        DBC_REQUIRE(refs > 0);
 
        *pu_num_procs = 0;
-       status = cfg_get_object((u32 *) &hdrv_obj, REG_DRV_OBJECT);
+
+       /* Retrieve the Object handle from the driver data */
+       if (!drv_datap || !drv_datap->drv_object) {
+               status = -ENODATA;
+               pr_err("%s: Failed to retrieve the object handle\n", __func__);
+       } else {
+               hdrv_obj = drv_datap->drv_object;
+       }
+
        if (!status) {
                status = drv_get_dev_object(processor_id, hdrv_obj, &hdev_obj);
                if (!status) {
@@ -219,8 +233,10 @@ int mgr_enum_processor_info(u32 processor_id,
        if (status)
                goto func_end;
 
-       /* Get The Manager Object from the Registry */
-       if (cfg_get_object((u32 *) &pmgr_obj, REG_MGR_OBJECT)) {
+       /* Get The Manager Object from the driver data */
+       if (drv_datap && drv_datap->mgr_object) {
+               pmgr_obj = drv_datap->mgr_object;
+       } else {
                dev_dbg(bridge, "%s: Failed to get MGR Object\n", __func__);
                goto func_end;
        }

diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c
index 0a7e30b4cbb1dfd608c05719cac9cf8155f4df7a..295845bc118f6501f3c21378c8404472982b62d9 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/proc.c
+++ b/drivers/staging/tidspbridge/rmgr/proc.c
@@ -280,6 +280,7 @@ proc_attach(u32 processor_id,
        struct proc_object *p_proc_object = NULL;
        struct mgr_object *hmgr_obj = NULL;
        struct drv_object *hdrv_obj = NULL;
+       struct drv_data *drv_datap = dev_get_drvdata(bridge);
        u8 dev_type;
 
        DBC_REQUIRE(refs > 0);
@@ -291,9 +292,13 @@ proc_attach(u32 processor_id,
        }
 
        /* Get the Driver and Manager Object Handles */
-       status = cfg_get_object((u32 *) &hdrv_obj, REG_DRV_OBJECT);
-       if (!status)
-               status = cfg_get_object((u32 *) &hmgr_obj, REG_MGR_OBJECT);
+       if (!drv_datap || !drv_datap->drv_object || !drv_datap->mgr_object) {
+               status = -ENODATA;
+               pr_err("%s: Failed to get object handles\n", __func__);
+       } else {
+               hdrv_obj = drv_datap->drv_object;
+               hmgr_obj = drv_datap->mgr_object;
+       }
 
        if (!status) {
                /* Get the Device Object */
@@ -440,6 +445,7 @@ int proc_auto_start(struct cfg_devnode *dev_node_obj,
        char sz_exec_file[MAXCMDLINELEN];
        char *argv[2];
        struct mgr_object *hmgr_obj = NULL;
+       struct drv_data *drv_datap = dev_get_drvdata(bridge);
        u8 dev_type;
 
        DBC_REQUIRE(refs > 0);
@@ -447,9 +453,13 @@ int proc_auto_start(struct cfg_devnode *dev_node_obj,
        DBC_REQUIRE(hdev_obj != NULL);
 
        /* Create a Dummy PROC Object */
-       status = cfg_get_object((u32 *) &hmgr_obj, REG_MGR_OBJECT);
-       if (status)
+       if (!drv_datap || !drv_datap->mgr_object) {
+               status = -ENODATA;
+               pr_err("%s: Failed to retrieve the object handle\n", __func__);
                goto func_end;
+       } else {
+               hmgr_obj = drv_datap->mgr_object;
+       }
 
        p_proc_object = kzalloc(sizeof(struct proc_object), GFP_KERNEL);
        if (p_proc_object == NULL) {

diff --git a/drivers/staging/tidspbridge/services/cfg.c b/drivers/staging/tidspbridge/services/cfg.c
index 302eaddaa0d0e6dee1edc9f9343a1957c787849f..94d8ebe66fd012abcf1ee551b73b2ffc407e93f0 100644 (file)
--- a/drivers/staging/tidspbridge/services/cfg.c
+++ b/drivers/staging/tidspbridge/services/cfg.c
@@ -30,50 +30,6 @@
 #include <dspbridge/cfg.h>
 #include <dspbridge/drv.h>
 
-/*
- *  ======== cfg_get_object ========
- *  Purpose:
- *      Retrieve the Object handle from the Registry
- */
-int cfg_get_object(u32 *value, u8 dw_type)
-{
-       int status = -EINVAL;
-       struct drv_data *drv_datap = dev_get_drvdata(bridge);
-
-       DBC_REQUIRE(value != NULL);
-
-       if (!drv_datap)
-               return -EPERM;
-
-       switch (dw_type) {
-       case (REG_DRV_OBJECT):
-               if (drv_datap->drv_object) {
-                       *value = (u32)drv_datap->drv_object;
-                       status = 0;
-               } else {
-                       status = -ENODATA;
-               }
-               break;
-       case (REG_MGR_OBJECT):
-               if (drv_datap->mgr_object) {
-                       *value = (u32)drv_datap->mgr_object;
-                       status = 0;
-               } else {
-                       status = -ENODATA;
-               }
-               break;
-
-       default:
-               break;
-       }
-       if (status) {
-               *value = 0;
-               pr_err("%s: Failed, status 0x%x\n", __func__, status);
-       }
-       DBC_ENSURE((!status && *value != 0) || (status && *value == 0));
-       return status;
-}
-
 /*
  *  ======== cfg_set_dev_object ========
  *  Purpose: