diff options
| author | Ivan Gomez Castellanos | 2010-08-26 00:09:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-08-31 20:23:15 +0200 |
| commit | 73b87a916697999bfafd4c43956ba98a2905ecfe (patch) | |
| tree | 0b95b82800340d7c7fc5684cb36fe7497aa3426b /drivers/staging/tidspbridge/pmgr/dev.c | |
| parent | staging: tidspbridge: Remove cfg_get_exec_file() (diff) | |
| download | kernel-qcow2-linux-73b87a916697999bfafd4c43956ba98a2905ecfe.tar.gz kernel-qcow2-linux-73b87a916697999bfafd4c43956ba98a2905ecfe.tar.xz kernel-qcow2-linux-73b87a916697999bfafd4c43956ba98a2905ecfe.zip | |
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>
Diffstat (limited to 'drivers/staging/tidspbridge/pmgr/dev.c')
| -rw-r--r-- | drivers/staging/tidspbridge/pmgr/dev.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c index 7893f9a0cf0e..8077bdce7494 100644 --- 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) { |