diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com>
| 2010-07-04 16:34:36 +0300 |
|---|---|---|
| committer |  Greg Kroah-Hartman <gregkh@suse.de>
| 2010-07-08 13:33:01 -0700 |
| commit | 61a5b769d3a21fc6225d60547d923409077e7ab3 (patch) | |
| tree | 1554539c3abd2b96e9139ce3d1cb552c49222c4f /drivers/staging/tidspbridge/pmgr | |
| parent | staging: ti dspbridge: deh: remove err_info (diff) | |
| download | linux-61a5b769d3a21fc6225d60547d923409077e7ab3.tar.gz linux-61a5b769d3a21fc6225d60547d923409077e7ab3.tar.bz2 linux-61a5b769d3a21fc6225d60547d923409077e7ab3.zip | |
staging: ti dspbridge: access deh directly
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/tidspbridge/pmgr')
| -rw-r--r-- | drivers/staging/tidspbridge/pmgr/dev.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c index 353b81a56d35..2c31f3142ec0 100644 --- a/drivers/staging/tidspbridge/pmgr/dev.c +++ b/drivers/staging/tidspbridge/pmgr/dev.c @@ -48,6 +48,7 @@ #include <dspbridge/io.h> #include <dspbridge/msg.h> #include <dspbridge/cmm.h> +#include <dspbridge/dspdeh.h> /* ----------------------------------- This */ #include <dspbridge/dev.h> @@ -237,8 +238,7 @@ int dev_create_device(OUT struct dev_object **phDevObject, /* Only create DEH manager if we have an IO manager */ if (DSP_SUCCEEDED(status)) { /* Instantiate the DEH module */ - status = (*dev_obj->bridge_interface.pfn_deh_create) - (&dev_obj->hdeh_mgr, dev_obj); + status = bridge_deh_create(&dev_obj->hdeh_mgr, dev_obj); } /* Create DMM mgr . */ status = dmm_create(&dev_obj->dmm_mgr, @@ -373,8 +373,7 @@ int dev_destroy_device(struct dev_object *hdev_obj) if (dev_obj->hdeh_mgr) { /* Uninitialize DEH module. */ - (*dev_obj->bridge_interface.pfn_deh_destroy) - (dev_obj->hdeh_mgr); + bridge_deh_destroy(dev_obj->hdeh_mgr); dev_obj->hdeh_mgr = NULL; } if (dev_obj->hcmm_mgr) { @@ -1115,10 +1114,6 @@ static void store_interface_fxns(struct bridge_drv_interface *drv_fxns, STORE_FXN(fxn_chnl_getmgrinfo, pfn_chnl_get_mgr_info); STORE_FXN(fxn_chnl_idle, pfn_chnl_idle); STORE_FXN(fxn_chnl_registernotify, pfn_chnl_register_notify); - STORE_FXN(fxn_deh_create, pfn_deh_create); - STORE_FXN(fxn_deh_destroy, pfn_deh_destroy); - STORE_FXN(fxn_deh_notify, pfn_deh_notify); - STORE_FXN(fxn_deh_registernotify, pfn_deh_register_notify); STORE_FXN(fxn_io_create, pfn_io_create); STORE_FXN(fxn_io_destroy, pfn_io_destroy); STORE_FXN(fxn_io_onloaded, pfn_io_on_loaded); @@ -1155,10 +1150,6 @@ static void store_interface_fxns(struct bridge_drv_interface *drv_fxns, DBC_ENSURE(intf_fxns->pfn_chnl_get_mgr_info != NULL); DBC_ENSURE(intf_fxns->pfn_chnl_idle != NULL); DBC_ENSURE(intf_fxns->pfn_chnl_register_notify != NULL); - DBC_ENSURE(intf_fxns->pfn_deh_create != NULL); - DBC_ENSURE(intf_fxns->pfn_deh_destroy != NULL); - DBC_ENSURE(intf_fxns->pfn_deh_notify != NULL); - DBC_ENSURE(intf_fxns->pfn_deh_register_notify != NULL); DBC_ENSURE(intf_fxns->pfn_io_create != NULL); DBC_ENSURE(intf_fxns->pfn_io_destroy != NULL); DBC_ENSURE(intf_fxns->pfn_io_on_loaded != NULL); |