staging: ti dspbridge: deh: remove get_info

Nobody is using it.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index 1000c0450505cdb49d2393f2b2bef068fc622cce..ef4abb4e773e72e84b21ab3b296b805c468a6fa6 100644 (file)
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -199,7 +199,6 @@ static struct bridge_drv_interface drv_interface_fxns = {
        bridge_deh_destroy,
        bridge_deh_notify,
        bridge_deh_register_notify,
-       bridge_deh_get_info,
        /* The following IO functions are provided by chnl_io.lib: */
        bridge_io_create,
        bridge_io_destroy,

diff --git a/drivers/staging/tidspbridge/core/ue_deh.c b/drivers/staging/tidspbridge/core/ue_deh.c
index 1e506d767cecca12714cdf52510f4b203076f0ae..a4940a8e8af5568d41cb9a3c9be45a4c128a0356 100644 (file)
--- a/drivers/staging/tidspbridge/core/ue_deh.c
+++ b/drivers/staging/tidspbridge/core/ue_deh.c
@@ -262,18 +262,3 @@ void bridge_deh_notify(struct deh_mgr *deh_mgr, u32 ulEventMask, u32 dwErrInfo)
         */
        dsp_wdt_enable(false);
 }
-
-int bridge_deh_get_info(struct deh_mgr *deh_mgr,
-               struct dsp_errorinfo *pErrInfo)
-{
-       if (!deh_mgr)
-               return -EFAULT;
-
-       /* Copy DEH error info structure to PROC error info structure. */
-       pErrInfo->dw_err_mask = deh_mgr->err_info.dw_err_mask;
-       pErrInfo->dw_val1 = deh_mgr->err_info.dw_val1;
-       pErrInfo->dw_val2 = deh_mgr->err_info.dw_val2;
-       pErrInfo->dw_val3 = deh_mgr->err_info.dw_val3;
-
-       return 0;
-}

diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
index 493f62e4187461cac13ce6c2b67b775152a2bad9..49842a2ff96e2fac2a29dce4baf7fe611ac9417c 100644 (file)
--- a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
@@ -774,24 +774,6 @@ typedef int(*fxn_deh_registernotify)
  (struct deh_mgr *hdeh_mgr,
   u32 event_mask, u32 notify_type, struct dsp_notification *hnotification);
 
-/*
- *  ======== bridge_deh_get_info ========
- *  Purpose:
- *      Get DSP exception info.
- *  Parameters:
- *      phDehMgr:       Location to store DEH manager on output.
- *      pErrInfo:       Ptr to error info structure.
- *  Returns:
- *      0:        Success.
- *      -EPERM:      Creation failed.
- *  Requires:
- *      phDehMgr != NULL;
- *      pErrorInfo != NULL;
- *  Ensures:
- */
-typedef int(*fxn_deh_getinfo) (struct deh_mgr *phDehMgr,
-                                     struct dsp_errorinfo *pErrInfo);
-
 /*
  *  ======== bridge_io_create ========
  *  Purpose:
@@ -1082,7 +1064,6 @@ struct bridge_drv_interface {
        fxn_deh_notify pfn_deh_notify;  /* Notify of DSP error */
        /* register for deh notif. */
        fxn_deh_registernotify pfn_deh_register_notify;
-       fxn_deh_getinfo pfn_deh_get_info;       /* register for deh notif. */
        fxn_io_create pfn_io_create;    /* Create IO manager */
        fxn_io_destroy pfn_io_destroy;  /* Destroy IO manager */
        fxn_io_onloaded pfn_io_on_loaded;       /* Notify of program loaded */

diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspdeh.h b/drivers/staging/tidspbridge/include/dspbridge/dspdeh.h
index af19926c79592e819cea15d5cfb6209f4ce8ac01..f2bfd895140257c189b13ee138c039cbe59b1ba8 100644 (file)
--- a/drivers/staging/tidspbridge/include/dspbridge/dspdeh.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspdeh.h
@@ -32,9 +32,6 @@ extern int bridge_deh_create(struct deh_mgr **ret_deh_mgr,
 
 extern int bridge_deh_destroy(struct deh_mgr *deh_mgr);
 
-extern int bridge_deh_get_info(struct deh_mgr *deh_mgr,
-               struct dsp_errorinfo *pErrInfo);
-
 extern int bridge_deh_register_notify(struct deh_mgr *deh_mgr,
                u32 event_mask,
                u32 notify_type,

diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c
index 50a5d9723dd78981269366ce58e848d068770e66..353b81a56d354fa944a593ab66d34902eabaf8b3 100644 (file)
--- a/drivers/staging/tidspbridge/pmgr/dev.c
+++ b/drivers/staging/tidspbridge/pmgr/dev.c
@@ -1119,7 +1119,6 @@ static void store_interface_fxns(struct bridge_drv_interface *drv_fxns,
                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_deh_getinfo, pfn_deh_get_info);
                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);
@@ -1160,7 +1159,6 @@ static void store_interface_fxns(struct bridge_drv_interface *drv_fxns,
        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_deh_get_info != 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);

diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c
index b1979cef88063e46fba86e46eae620c859934d5c..c31f8b87311c6763e02d8ee9e51149c0d0124df7 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/proc.c
+++ b/drivers/staging/tidspbridge/rmgr/proc.c
@@ -970,7 +970,6 @@ int proc_get_state(void *hprocessor,
        int status = 0;
        struct proc_object *p_proc_object = (struct proc_object *)hprocessor;
        int brd_status;
-       struct deh_mgr *hdeh_mgr;
 
        DBC_REQUIRE(refs > 0);
        DBC_REQUIRE(proc_state_obj != NULL);
@@ -1003,11 +1002,6 @@ int proc_get_state(void *hprocessor,
                                break;
                        }
                }
-               /* Next, retrieve error information, if any */
-               status = dev_get_deh_mgr(p_proc_object->hdev_obj, &hdeh_mgr);
-               if (DSP_SUCCEEDED(status) && hdeh_mgr)
-                       status = (*p_proc_object->intf_fxns->pfn_deh_get_info)
-                           (hdeh_mgr, &(proc_state_obj->err_info));
        } else {
                status = -EFAULT;
        }