aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/tidspbridge/core
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/core
parentstaging: tidspbridge: remove OPTIONAL (diff)
downloadlinux-dev-e6bf74f06f5178fcccb66acf51d1f6ebc4e6c5d0.tar.xz
linux-dev-e6bf74f06f5178fcccb66acf51d1f6ebc4e6c5d0.zip
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/core')
-rw-r--r--drivers/staging/tidspbridge/core/chnl_sm.c14
-rw-r--r--drivers/staging/tidspbridge/core/io_sm.c12
-rw-r--r--drivers/staging/tidspbridge/core/msg_sm.c4
-rw-r--r--drivers/staging/tidspbridge/core/tiomap3430.c14
-rw-r--r--drivers/staging/tidspbridge/core/tiomap_io.c2
-rw-r--r--drivers/staging/tidspbridge/core/tiomap_io.h4
6 files changed, 25 insertions, 25 deletions
diff --git a/drivers/staging/tidspbridge/core/chnl_sm.c b/drivers/staging/tidspbridge/core/chnl_sm.c
index 7640547a8a43..6074bffec1fa 100644
--- a/drivers/staging/tidspbridge/core/chnl_sm.c
+++ b/drivers/staging/tidspbridge/core/chnl_sm.c
@@ -81,7 +81,7 @@ static void free_chirp_list(struct lst_list *chirp_list);
static struct chnl_irp *make_new_chirp(void);
static int search_free_channel(struct chnl_mgr *chnl_mgr_obj,
- OUT u32 *chnl);
+ u32 *chnl);
/*
* ======== bridge_chnl_add_io_req ========
@@ -381,7 +381,7 @@ func_cont:
* Create a channel manager object, responsible for opening new channels
* and closing old ones for a given board.
*/
-int bridge_chnl_create(OUT struct chnl_mgr **channel_mgr,
+int bridge_chnl_create(struct chnl_mgr **channel_mgr,
struct dev_object *hdev_obj,
const struct chnl_mgrattrs *mgr_attrts)
{
@@ -534,7 +534,7 @@ int bridge_chnl_flush_io(struct chnl_object *chnl_obj, u32 timeout)
* Retrieve information related to a channel.
*/
int bridge_chnl_get_info(struct chnl_object *chnl_obj,
- OUT struct chnl_info *channel_info)
+ struct chnl_info *channel_info)
{
int status = 0;
struct chnl_object *pchnl = (struct chnl_object *)chnl_obj;
@@ -568,7 +568,7 @@ int bridge_chnl_get_info(struct chnl_object *chnl_obj,
* Note: Ensures Channel Invariant (see notes above).
*/
int bridge_chnl_get_ioc(struct chnl_object *chnl_obj, u32 timeout,
- OUT struct chnl_ioc *chan_ioc)
+ struct chnl_ioc *chan_ioc)
{
int status = 0;
struct chnl_object *pchnl = (struct chnl_object *)chnl_obj;
@@ -711,7 +711,7 @@ func_end:
* Retrieve information related to the channel manager.
*/
int bridge_chnl_get_mgr_info(struct chnl_mgr *hchnl_mgr, u32 ch_id,
- OUT struct chnl_mgrinfo *mgr_info)
+ struct chnl_mgrinfo *mgr_info)
{
int status = 0;
struct chnl_mgr *chnl_mgr_obj = (struct chnl_mgr *)hchnl_mgr;
@@ -775,7 +775,7 @@ int bridge_chnl_idle(struct chnl_object *chnl_obj, u32 timeout,
* ======== bridge_chnl_open ========
* Open a new half-duplex channel to the DSP board.
*/
-int bridge_chnl_open(OUT struct chnl_object **chnl,
+int bridge_chnl_open(struct chnl_object **chnl,
struct chnl_mgr *hchnl_mgr, s8 chnl_mode,
u32 ch_id, const struct chnl_attr *pattrs)
{
@@ -997,7 +997,7 @@ static struct chnl_irp *make_new_chirp(void)
* Search for a free channel slot in the array of channel pointers.
*/
static int search_free_channel(struct chnl_mgr *chnl_mgr_obj,
- OUT u32 *chnl)
+ u32 *chnl)
{
int status = -ENOSR;
u32 i;
diff --git a/drivers/staging/tidspbridge/core/io_sm.c b/drivers/staging/tidspbridge/core/io_sm.c
index 06b47ca6e096..ba2e6bdf49f4 100644
--- a/drivers/staging/tidspbridge/core/io_sm.c
+++ b/drivers/staging/tidspbridge/core/io_sm.c
@@ -133,7 +133,7 @@ struct io_mgr {
/* Function Prototypes */
static void io_dispatch_chnl(struct io_mgr *pio_mgr,
- OUT struct chnl_object *pchnl, u8 io_mode);
+ struct chnl_object *pchnl, u8 io_mode);
static void io_dispatch_msg(struct io_mgr *pio_mgr,
struct msg_mgr *hmsg_mgr);
static void io_dispatch_pm(struct io_mgr *pio_mgr);
@@ -161,7 +161,7 @@ static int register_shm_segs(struct io_mgr *hio_mgr,
* ======== bridge_io_create ========
* Create an IO manager object.
*/
-int bridge_io_create(OUT struct io_mgr **io_man,
+int bridge_io_create(struct io_mgr **io_man,
struct dev_object *hdev_obj,
const struct io_attrs *mgr_attrts)
{
@@ -839,7 +839,7 @@ func_end:
* Proc-copy chanl dispatch.
*/
static void io_dispatch_chnl(struct io_mgr *pio_mgr,
- OUT struct chnl_object *pchnl, u8 io_mode)
+ struct chnl_object *pchnl, u8 io_mode)
{
if (!pio_mgr)
goto func_end;
@@ -919,7 +919,7 @@ static void io_dispatch_pm(struct io_mgr *pio_mgr)
* out the dispatch of I/O as a non-preemptible event.It can only be
* pre-empted by an ISR.
*/
-void io_dpc(OUT unsigned long ref_data)
+void io_dpc(unsigned long ref_data)
{
struct io_mgr *pio_mgr = (struct io_mgr *)ref_data;
struct chnl_mgr *chnl_mgr_obj;
@@ -1014,7 +1014,7 @@ void io_mbox_msg(u32 msg)
* interrupts the DSP.
*/
void io_request_chnl(struct io_mgr *io_manager, struct chnl_object *pchnl,
- u8 io_mode, OUT u16 *mbx_val)
+ u8 io_mode, u16 *mbx_val)
{
struct chnl_mgr *chnl_mgr_obj;
struct shm *sm;
@@ -1793,7 +1793,7 @@ int io_sh_msetting(struct io_mgr *hio_mgr, u8 desc, void *pargs)
* Gets the Processor's Load information
*/
int bridge_io_get_proc_load(struct io_mgr *hio_mgr,
- OUT struct dsp_procloadstat *proc_lstat)
+ struct dsp_procloadstat *proc_lstat)
{
proc_lstat->curr_load =
hio_mgr->shared_mem->load_mon_info.curr_dsp_load;
diff --git a/drivers/staging/tidspbridge/core/msg_sm.c b/drivers/staging/tidspbridge/core/msg_sm.c
index 26808fc1bb30..7f44294aca29 100644
--- a/drivers/staging/tidspbridge/core/msg_sm.c
+++ b/drivers/staging/tidspbridge/core/msg_sm.c
@@ -48,7 +48,7 @@ static void free_msg_list(struct lst_list *msg_list);
* Create an object to manage message queues. Only one of these objects
* can exist per device object.
*/
-int bridge_msg_create(OUT struct msg_mgr **msg_man,
+int bridge_msg_create(struct msg_mgr **msg_man,
struct dev_object *hdev_obj,
msg_onexit msg_callback)
{
@@ -120,7 +120,7 @@ func_end:
* on the DSP.
*/
int bridge_msg_create_queue(struct msg_mgr *hmsg_mgr,
- OUT struct msg_queue **msgq,
+ struct msg_queue **msgq,
u32 msgq_id, u32 max_msgs, void *arg)
{
u32 i;
diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index 4e1eee00ba33..08a2f5fcbfb0 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -76,7 +76,7 @@
/* Forward Declarations: */
static int bridge_brd_monitor(struct bridge_dev_context *dev_ctxt);
static int bridge_brd_read(struct bridge_dev_context *dev_ctxt,
- OUT u8 *host_buff,
+ u8 *host_buff,
u32 dsp_addr, u32 ul_num_bytes,
u32 mem_type);
static int bridge_brd_start(struct bridge_dev_context *dev_ctxt,
@@ -102,12 +102,12 @@ static int bridge_brd_mem_map(struct bridge_dev_context *dev_ctxt,
struct page **mapped_pages);
static int bridge_brd_mem_un_map(struct bridge_dev_context *dev_ctxt,
u32 virt_addr, u32 ul_num_bytes);
-static int bridge_dev_create(OUT struct bridge_dev_context
+static int bridge_dev_create(struct bridge_dev_context
**dev_cntxt,
struct dev_object *hdev_obj,
struct cfg_hostres *config_param);
static int bridge_dev_ctrl(struct bridge_dev_context *dev_context,
- u32 dw_cmd, OUT void *pargs);
+ u32 dw_cmd, void *pargs);
static int bridge_dev_destroy(struct bridge_dev_context *dev_ctxt);
static u32 user_va2_pa(struct mm_struct *mm, u32 address);
static int pte_update(struct bridge_dev_context *dev_ctxt, u32 pa,
@@ -236,7 +236,7 @@ static void bad_page_dump(u32 pa, struct page *pg)
* purpose:
* Bridge Driver entry point.
*/
-void bridge_drv_entry(OUT struct bridge_drv_interface **drv_intf,
+void bridge_drv_entry(struct bridge_drv_interface **drv_intf,
const char *driver_file_name)
{
@@ -304,7 +304,7 @@ static int bridge_brd_monitor(struct bridge_dev_context *dev_ctxt)
* Reads buffers for DSP memory.
*/
static int bridge_brd_read(struct bridge_dev_context *dev_ctxt,
- OUT u8 *host_buff, u32 dsp_addr,
+ u8 *host_buff, u32 dsp_addr,
u32 ul_num_bytes, u32 mem_type)
{
int status = 0;
@@ -785,7 +785,7 @@ static int bridge_brd_write(struct bridge_dev_context *dev_ctxt,
* ======== bridge_dev_create ========
* Creates a driver object. Puts DSP in self loop.
*/
-static int bridge_dev_create(OUT struct bridge_dev_context
+static int bridge_dev_create(struct bridge_dev_context
**dev_cntxt,
struct dev_object *hdev_obj,
struct cfg_hostres *config_param)
@@ -954,7 +954,7 @@ func_end:
* Receives device specific commands.
*/
static int bridge_dev_ctrl(struct bridge_dev_context *dev_context,
- u32 dw_cmd, OUT void *pargs)
+ u32 dw_cmd, void *pargs)
{
int status = 0;
struct bridge_ioctl_extproc *pa_ext_proc =
diff --git a/drivers/staging/tidspbridge/core/tiomap_io.c b/drivers/staging/tidspbridge/core/tiomap_io.c
index bfe47c52ffe0..742da05af0c6 100644
--- a/drivers/staging/tidspbridge/core/tiomap_io.c
+++ b/drivers/staging/tidspbridge/core/tiomap_io.c
@@ -51,7 +51,7 @@ bool symbols_reloaded = true;
* Copies DSP external memory buffers to the host side buffers.
*/
int read_ext_dsp_data(struct bridge_dev_context *dev_ctxt,
- OUT u8 *host_buff, u32 dsp_addr,
+ u8 *host_buff, u32 dsp_addr,
u32 ul_num_bytes, u32 mem_type)
{
int status = 0;
diff --git a/drivers/staging/tidspbridge/core/tiomap_io.h b/drivers/staging/tidspbridge/core/tiomap_io.h
index 5358752616d7..a3f19c7b79f3 100644
--- a/drivers/staging/tidspbridge/core/tiomap_io.h
+++ b/drivers/staging/tidspbridge/core/tiomap_io.h
@@ -48,14 +48,14 @@
* is configured by the combination of DSP MMU and shm Memory manager in the CDB
*/
extern int read_ext_dsp_data(struct bridge_dev_context *dev_ctxt,
- OUT u8 *host_buff, u32 dsp_addr,
+ u8 *host_buff, u32 dsp_addr,
u32 ul_num_bytes, u32 mem_type);
/*
* ======== write_dsp_data ========
*/
extern int write_dsp_data(struct bridge_dev_context *dev_context,
- OUT u8 *host_buff, u32 dsp_addr,
+ u8 *host_buff, u32 dsp_addr,
u32 ul_num_bytes, u32 mem_type);
/*