summaryrefslogtreecommitdiffstats
path: root/drivers/staging/tidspbridge/rmgr
diff options
context:
space:
mode:
authorMenon, Nishanth <nm@ti.com>2010-07-22 16:03:49 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-07-22 14:41:04 -0700
commite6bf74f06f5178fcccb66acf51d1f6ebc4e6c5d0 (patch)
tree5a543ff5088ea3eeea3054383d384bcd60b96e3c /drivers/staging/tidspbridge/rmgr
parent21aaf42ec990e7e169fff67ffb97b2f13e0b7ed3 (diff)
downloadop-kernel-dev-e6bf74f06f5178fcccb66acf51d1f6ebc4e6c5d0.zip
op-kernel-dev-e6bf74f06f5178fcccb66acf51d1f6ebc4e6c5d0.tar.gz
staging: tidspbridge: remove OUT define
Remove OUT modifier which makes no sense for linux kernel Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/tidspbridge/rmgr')
-rw-r--r--drivers/staging/tidspbridge/rmgr/dbdcd.c34
-rw-r--r--drivers/staging/tidspbridge/rmgr/disp.c6
-rw-r--r--drivers/staging/tidspbridge/rmgr/drv.c6
-rw-r--r--drivers/staging/tidspbridge/rmgr/dspdrv.c2
-rw-r--r--drivers/staging/tidspbridge/rmgr/mgr.c14
-rw-r--r--drivers/staging/tidspbridge/rmgr/nldr.c6
-rw-r--r--drivers/staging/tidspbridge/rmgr/node.c22
-rw-r--r--drivers/staging/tidspbridge/rmgr/proc.c8
-rw-r--r--drivers/staging/tidspbridge/rmgr/strm.c12
9 files changed, 55 insertions, 55 deletions
diff --git a/drivers/staging/tidspbridge/rmgr/dbdcd.c b/drivers/staging/tidspbridge/rmgr/dbdcd.c
index c89db0e..cceceb9 100644
--- a/drivers/staging/tidspbridge/rmgr/dbdcd.c
+++ b/drivers/staging/tidspbridge/rmgr/dbdcd.c
@@ -69,10 +69,10 @@ static void compress_buf(char *psz_buf, u32 ul_buf_size, s32 char_size);
static char dsp_char2_gpp_char(char *word, s32 dsp_char_size);
static int get_dep_lib_info(struct dcd_manager *hdcd_mgr,
struct dsp_uuid *uuid_obj,
- OUT u16 *num_libs,
- OUT u16 *num_pers_libs,
- OUT struct dsp_uuid *dep_lib_uuids,
- OUT bool *prstnt_dep_libs,
+ u16 *num_libs,
+ u16 *num_pers_libs,
+ struct dsp_uuid *dep_lib_uuids,
+ bool *prstnt_dep_libs,
enum nldr_phase phase);
/*
@@ -125,7 +125,7 @@ int dcd_auto_unregister(struct dcd_manager *hdcd_mgr,
* Creates DCD manager.
*/
int dcd_create_manager(char *sz_zl_dll_name,
- OUT struct dcd_manager **dcd_mgr)
+ struct dcd_manager **dcd_mgr)
{
struct cod_manager *cod_mgr; /* COD manager handle */
struct dcd_manager *dcd_mgr_obj = NULL; /* DCD Manager pointer */
@@ -194,7 +194,7 @@ int dcd_destroy_manager(struct dcd_manager *hdcd_mgr)
* Enumerates objects in the DCD.
*/
int dcd_enumerate_object(s32 index, enum dsp_dcdobjtype obj_type,
- OUT struct dsp_uuid *uuid_obj)
+ struct dsp_uuid *uuid_obj)
{
int status = 0;
char sz_reg_key[DCD_MAXPATHLENGTH];
@@ -327,8 +327,8 @@ void dcd_exit(void)
*/
int dcd_get_dep_libs(struct dcd_manager *hdcd_mgr,
struct dsp_uuid *uuid_obj,
- u16 num_libs, OUT struct dsp_uuid *dep_lib_uuids,
- OUT bool *prstnt_dep_libs,
+ u16 num_libs, struct dsp_uuid *dep_lib_uuids,
+ bool *prstnt_dep_libs,
enum nldr_phase phase)
{
int status = 0;
@@ -351,7 +351,7 @@ int dcd_get_dep_libs(struct dcd_manager *hdcd_mgr,
*/
int dcd_get_num_dep_libs(struct dcd_manager *hdcd_mgr,
struct dsp_uuid *uuid_obj,
- OUT u16 *num_libs, OUT u16 *num_pers_libs,
+ u16 *num_libs, u16 *num_pers_libs,
enum nldr_phase phase)
{
int status = 0;
@@ -377,7 +377,7 @@ int dcd_get_num_dep_libs(struct dcd_manager *hdcd_mgr,
int dcd_get_object_def(struct dcd_manager *hdcd_mgr,
struct dsp_uuid *obj_uuid,
enum dsp_dcdobjtype obj_type,
- OUT struct dcd_genericobj *obj_def)
+ struct dcd_genericobj *obj_def)
{
struct dcd_manager *dcd_mgr_obj = hdcd_mgr; /* ptr to DCD mgr */
struct cod_libraryobj *lib = NULL;
@@ -644,9 +644,9 @@ func_end:
*/
int dcd_get_library_name(struct dcd_manager *hdcd_mgr,
struct dsp_uuid *uuid_obj,
- OUT char *str_lib_name,
- OUT u32 *buff_size,
- enum nldr_phase phase, OUT bool *phase_split)
+ char *str_lib_name,
+ u32 *buff_size,
+ enum nldr_phase phase, bool *phase_split)
{
char sz_reg_key[DCD_MAXPATHLENGTH];
char sz_uuid[MAXUUIDLEN];
@@ -1393,10 +1393,10 @@ static char dsp_char2_gpp_char(char *word, s32 dsp_char_size)
*/
static int get_dep_lib_info(struct dcd_manager *hdcd_mgr,
struct dsp_uuid *uuid_obj,
- OUT u16 *num_libs,
- OUT u16 *num_pers_libs,
- OUT struct dsp_uuid *dep_lib_uuids,
- OUT bool *prstnt_dep_libs,
+ u16 *num_libs,
+ u16 *num_pers_libs,
+ struct dsp_uuid *dep_lib_uuids,
+ bool *prstnt_dep_libs,
enum nldr_phase phase)
{
struct dcd_manager *dcd_mgr_obj = hdcd_mgr;
diff --git a/drivers/staging/tidspbridge/rmgr/disp.c b/drivers/staging/tidspbridge/rmgr/disp.c
index 7f3fdfd..29cf6cd 100644
--- a/drivers/staging/tidspbridge/rmgr/disp.c
+++ b/drivers/staging/tidspbridge/rmgr/disp.c
@@ -81,13 +81,13 @@ static int fill_stream_def(rms_word *pdw_buf, u32 *ptotal, u32 offset,
struct node_strmdef strm_def, u32 max,
u32 chars_in_rms_word);
static int send_message(struct disp_object *disp_obj, u32 timeout,
- u32 ul_bytes, OUT u32 *pdw_arg);
+ u32 ul_bytes, u32 *pdw_arg);
/*
* ======== disp_create ========
* Create a NODE Dispatcher object.
*/
-int disp_create(OUT struct disp_object **dispatch_obj,
+int disp_create(struct disp_object **dispatch_obj,
struct dev_object *hdev_obj,
const struct disp_attr *disp_attrs)
{
@@ -252,7 +252,7 @@ int disp_node_create(struct disp_object *disp_obj,
struct node_object *hnode, u32 rms_fxn,
u32 ul_create_fxn,
const struct node_createargs *pargs,
- OUT nodeenv *node_env)
+ nodeenv *node_env)
{
struct node_msgargs node_msg_args;
struct node_taskargs task_arg_obj;
diff --git a/drivers/staging/tidspbridge/rmgr/drv.c b/drivers/staging/tidspbridge/rmgr/drv.c
index 3815622..2ce0737 100644
--- a/drivers/staging/tidspbridge/rmgr/drv.c
+++ b/drivers/staging/tidspbridge/rmgr/drv.c
@@ -422,7 +422,7 @@ int drv_proc_update_strm_res(u32 num_bufs, void *strm_resources)
* Purpose:
* DRV Object gets created only once during Driver Loading.
*/
-int drv_create(OUT struct drv_object **drv_obj)
+int drv_create(struct drv_object **drv_obj)
{
int status = 0;
struct drv_object *pdrv_object = NULL;
@@ -969,7 +969,7 @@ void mem_ext_phys_pool_release(void)
* Allocate physically contiguous, uncached memory from external memory pool
*/
-static void *mem_ext_phys_mem_alloc(u32 bytes, u32 align, OUT u32 * phys_addr)
+static void *mem_ext_phys_mem_alloc(u32 bytes, u32 align, u32 * phys_addr)
{
u32 new_alloc_ptr;
u32 offset;
@@ -1013,7 +1013,7 @@ static void *mem_ext_phys_mem_alloc(u32 bytes, u32 align, OUT u32 * phys_addr)
* Allocate physically contiguous, uncached memory
*/
void *mem_alloc_phys_mem(u32 byte_size, u32 align_mask,
- OUT u32 *physical_address)
+ u32 *physical_address)
{
void *va_mem = NULL;
dma_addr_t pa_mem;
diff --git a/drivers/staging/tidspbridge/rmgr/dspdrv.c b/drivers/staging/tidspbridge/rmgr/dspdrv.c
index b50cdc5..8fedf18 100644
--- a/drivers/staging/tidspbridge/rmgr/dspdrv.c
+++ b/drivers/staging/tidspbridge/rmgr/dspdrv.c
@@ -44,7 +44,7 @@
* ======== dsp_init ========
* Allocates bridge resources. Loads a base image onto DSP, if specified.
*/
-u32 dsp_init(OUT u32 *init_status)
+u32 dsp_init(u32 *init_status)
{
char dev_node[MAXREGPATHLENGTH] = "TIOMAP1510";
int status = -EPERM;
diff --git a/drivers/staging/tidspbridge/rmgr/mgr.c b/drivers/staging/tidspbridge/rmgr/mgr.c
index 54f8580..805d3ca 100644
--- a/drivers/staging/tidspbridge/rmgr/mgr.c
+++ b/drivers/staging/tidspbridge/rmgr/mgr.c
@@ -53,7 +53,7 @@ static u32 refs;
* Purpose:
* MGR Object gets created only once during driver Loading.
*/
-int mgr_create(OUT struct mgr_object **mgr_obj,
+int mgr_create(struct mgr_object **mgr_obj,
struct cfg_devnode *dev_node_obj)
{
int status = 0;
@@ -114,8 +114,8 @@ int mgr_destroy(struct mgr_object *hmgr_obj)
* Enumerate and get configuration information about nodes configured
* in the node database.
*/
-int mgr_enum_node_info(u32 node_id, OUT struct dsp_ndbprops *pndb_props,
- u32 undb_props_size, OUT u32 *pu_num_nodes)
+int mgr_enum_node_info(u32 node_id, struct dsp_ndbprops *pndb_props,
+ u32 undb_props_size, u32 *pu_num_nodes)
{
int status = 0;
struct dsp_uuid node_uuid, temp_uuid;
@@ -178,9 +178,9 @@ func_cont:
* DSP processors.
*/
int mgr_enum_processor_info(u32 processor_id,
- OUT struct dsp_processorinfo *
+ struct dsp_processorinfo *
processor_info, u32 processor_info_size,
- OUT u8 *pu_num_procs)
+ u8 *pu_num_procs)
{
int status = 0;
int status1 = 0;
@@ -305,7 +305,7 @@ void mgr_exit(void)
* Retrieves the MGR handle. Accessor Function.
*/
int mgr_get_dcd_handle(struct mgr_object *mgr_handle,
- OUT u32 *dcd_handle)
+ u32 *dcd_handle)
{
int status = -EPERM;
struct mgr_object *pmgr_obj = (struct mgr_object *)mgr_handle;
@@ -355,7 +355,7 @@ bool mgr_init(void)
* Block on any Bridge event(s)
*/
int mgr_wait_for_bridge_events(struct dsp_notification **anotifications,
- u32 count, OUT u32 *pu_index,
+ u32 count, u32 *pu_index,
u32 utimeout)
{
int status;
diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/tidspbridge/rmgr/nldr.c
index e35ee7d..6cf0be9 100644
--- a/drivers/staging/tidspbridge/rmgr/nldr.c
+++ b/drivers/staging/tidspbridge/rmgr/nldr.c
@@ -326,7 +326,7 @@ static u32 find_gcf(u32 a, u32 b);
*/
int nldr_allocate(struct nldr_object *nldr_obj, void *priv_ref,
const struct dcd_nodeprops *node_props,
- OUT struct nldr_nodeobject **nldr_nodeobj,
+ struct nldr_nodeobject **nldr_nodeobj,
bool *pf_phase_split)
{
struct nldr_nodeobject *nldr_node_obj = NULL;
@@ -425,7 +425,7 @@ int nldr_allocate(struct nldr_object *nldr_obj, void *priv_ref,
/*
* ======== nldr_create ========
*/
-int nldr_create(OUT struct nldr_object **nldr,
+int nldr_create(struct nldr_object **nldr,
struct dev_object *hdev_obj,
const struct nldr_attrs *pattrs)
{
@@ -776,7 +776,7 @@ int nldr_get_fxn_addr(struct nldr_nodeobject *nldr_node_obj,
* Given a NLDR object, retrieve RMM Manager Handle
*/
int nldr_get_rmm_manager(struct nldr_object *nldr,
- OUT struct rmm_target_obj **rmm_mgr)
+ struct rmm_target_obj **rmm_mgr)
{
int status = 0;
struct nldr_object *nldr_obj = nldr;
diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c
index 069ee9e5..9f07c81 100644
--- a/drivers/staging/tidspbridge/rmgr/node.c
+++ b/drivers/staging/tidspbridge/rmgr/node.c
@@ -294,7 +294,7 @@ int node_allocate(struct proc_object *hprocessor,
const struct dsp_uuid *node_uuid,
const struct dsp_cbdata *pargs,
const struct dsp_nodeattrin *attr_in,
- OUT struct node_object **ph_node,
+ struct node_object **ph_node,
struct process_context *pr_ctxt)
{
struct node_mgr *hnode_mgr;
@@ -685,8 +685,8 @@ func_end:
* Allocates buffer for zero copy messaging.
*/
DBAPI node_alloc_msg_buf(struct node_object *hnode, u32 usize,
- OUT struct dsp_bufferattr *pattr,
- OUT u8 **pbuffer)
+ struct dsp_bufferattr *pattr,
+ u8 **pbuffer)
{
struct node_object *pnode = (struct node_object *)hnode;
int status = 0;
@@ -1300,7 +1300,7 @@ func_end:
* Purpose:
* Create a NODE Manager object.
*/
-int node_create_mgr(OUT struct node_mgr **node_man,
+int node_create_mgr(struct node_mgr **node_man,
struct dev_object *hdev_obj)
{
u32 i;
@@ -1613,8 +1613,8 @@ int node_delete_mgr(struct node_mgr *hnode_mgr)
* Enumerate currently allocated nodes.
*/
int node_enum_nodes(struct node_mgr *hnode_mgr, void **node_tab,
- u32 node_tab_size, OUT u32 *pu_num_nodes,
- OUT u32 *pu_allocated)
+ u32 node_tab_size, u32 *pu_num_nodes,
+ u32 *pu_allocated)
{
struct node_object *hnode;
u32 i;
@@ -1716,7 +1716,7 @@ func_end:
* structure.
*/
int node_get_attr(struct node_object *hnode,
- OUT struct dsp_nodeattr *pattr, u32 attr_size)
+ struct dsp_nodeattr *pattr, u32 attr_size)
{
struct node_mgr *hnode_mgr;
int status = 0;
@@ -1760,7 +1760,7 @@ int node_get_attr(struct node_object *hnode,
* host and a node.
*/
int node_get_channel_id(struct node_object *hnode, u32 dir, u32 index,
- OUT u32 *chan_id)
+ u32 *chan_id)
{
enum node_type node_type;
int status = -EINVAL;
@@ -1802,7 +1802,7 @@ int node_get_channel_id(struct node_object *hnode, u32 dir, u32 index,
* Retrieve a message from a node on the DSP.
*/
int node_get_message(struct node_object *hnode,
- OUT struct dsp_msg *message, u32 utimeout)
+ struct dsp_msg *message, u32 utimeout)
{
struct node_mgr *hnode_mgr;
enum node_type node_type;
@@ -2365,7 +2365,7 @@ func_end:
* Signal a node running on the DSP that it should exit its execute phase
* function.
*/
-int node_terminate(struct node_object *hnode, OUT int *pstatus)
+int node_terminate(struct node_object *hnode, int *pstatus)
{
struct node_object *pnode = (struct node_object *)hnode;
struct node_mgr *hnode_mgr = NULL;
@@ -3005,7 +3005,7 @@ static int get_proc_props(struct node_mgr *hnode_mgr,
*/
int node_get_uuid_props(void *hprocessor,
const struct dsp_uuid *node_uuid,
- OUT struct dsp_ndbprops *node_props)
+ struct dsp_ndbprops *node_props)
{
struct node_mgr *hnode_mgr = NULL;
struct dev_object *hdev_obj;
diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c
index be137ad..4d3db7e 100644
--- a/drivers/staging/tidspbridge/rmgr/proc.c
+++ b/drivers/staging/tidspbridge/rmgr/proc.c
@@ -582,8 +582,8 @@ int proc_detach(struct process_context *pr_ctxt)
* on a DSP processor.
*/
int proc_enum_nodes(void *hprocessor, void **node_tab,
- u32 node_tab_size, OUT u32 *pu_num_nodes,
- OUT u32 *pu_allocated)
+ u32 node_tab_size, u32 *pu_num_nodes,
+ u32 *pu_allocated)
{
int status = -EPERM;
struct proc_object *p_proc_object = (struct proc_object *)hprocessor;
@@ -849,7 +849,7 @@ int proc_invalidate_memory(void *hprocessor, void *pmpu_addr, u32 size)
* Enumerate the resources currently available on a processor.
*/
int proc_get_resource_info(void *hprocessor, u32 resource_type,
- OUT struct dsp_resourceinfo *resource_info,
+ struct dsp_resourceinfo *resource_info,
u32 resource_info_size)
{
int status = -EPERM;
@@ -964,7 +964,7 @@ int proc_get_dev_object(void *hprocessor,
* Report the state of the specified DSP processor.
*/
int proc_get_state(void *hprocessor,
- OUT struct dsp_processorstate *proc_state_obj,
+ struct dsp_processorstate *proc_state_obj,
u32 state_info_size)
{
int status = 0;
diff --git a/drivers/staging/tidspbridge/rmgr/strm.c b/drivers/staging/tidspbridge/rmgr/strm.c
index a439053..73888e3 100644
--- a/drivers/staging/tidspbridge/rmgr/strm.c
+++ b/drivers/staging/tidspbridge/rmgr/strm.c
@@ -98,7 +98,7 @@ static void delete_strm_mgr(struct strm_mgr *strm_mgr_obj);
* Allocates buffers for a stream.
*/
int strm_allocate_buffer(struct strm_object *stream_obj, u32 usize,
- OUT u8 **ap_buffer, u32 num_bufs,
+ u8 **ap_buffer, u32 num_bufs,
struct process_context *pr_ctxt)
{
int status = 0;
@@ -201,7 +201,7 @@ func_end:
* Purpose:
* Create a STRM manager object.
*/
-int strm_create(OUT struct strm_mgr **strm_man,
+int strm_create(struct strm_mgr **strm_man,
struct dev_object *dev_obj)
{
struct strm_mgr *strm_mgr_obj;
@@ -310,7 +310,7 @@ int strm_free_buffer(struct strm_object *stream_obj, u8 ** ap_buffer,
* Retrieves information about a stream.
*/
int strm_get_info(struct strm_object *stream_obj,
- OUT struct stream_info *stream_info,
+ struct stream_info *stream_info,
u32 stream_info_size)
{
struct bridge_drv_interface *intf_fxns;
@@ -469,7 +469,7 @@ int strm_issue(struct strm_object *stream_obj, u8 *pbuf, u32 ul_bytes,
*/
int strm_open(struct node_object *hnode, u32 dir, u32 index,
struct strm_attr *pattr,
- OUT struct strm_object **strm_objct,
+ struct strm_object **strm_objct,
struct process_context *pr_ctxt)
{
struct strm_mgr *strm_mgr_obj;
@@ -620,7 +620,7 @@ func_cont:
* Purpose:
* Relcaims a buffer from a stream.
*/
-int strm_reclaim(struct strm_object *stream_obj, OUT u8 ** buf_ptr,
+int strm_reclaim(struct strm_object *stream_obj, u8 ** buf_ptr,
u32 *nbytes, u32 *buff_size, u32 *pdw_arg)
{
struct bridge_drv_interface *intf_fxns;
@@ -747,7 +747,7 @@ int strm_register_notify(struct strm_object *stream_obj, u32 event_mask,
* Selects a ready stream.
*/
int strm_select(struct strm_object **strm_tab, u32 strms,
- OUT u32 *pmask, u32 utimeout)
+ u32 *pmask, u32 utimeout)
{
u32 index;
struct chnl_info chnl_info_obj;
OpenPOWER on IntegriCloud