[openib-general] Re: [PATCH] kDAPL: return is not a function
James Lentini
jlentini at netapp.com
Thu May 19 19:36:26 PDT 2005
Committed in revision 2422.
On Wed, 18 May 2005, Tom Duffy wrote:
tduffy> return is not a function
tduffy>
tduffy> Signed-off-by: Tom Duffy <tduffy at sun.com>
tduffy>
tduffy> Index: linux-kernel-return/dat-provider/dapl_cookie.c
tduffy> ===================================================================
tduffy> --- linux-kernel-return/dat-provider/dapl_cookie.c (revision 2382)
tduffy> +++ linux-kernel-return/dat-provider/dapl_cookie.c (working copy)
tduffy> @@ -134,9 +134,9 @@ u32 dapl_cb_create(DAPL_COOKIE_BUFFER *b
tduffy> buffer->pool[i].ep = ep;
tduffy> }
tduffy>
tduffy> - return (DAT_SUCCESS);
tduffy> + return DAT_SUCCESS;
tduffy> } else {
tduffy> - return (DAT_INSUFFICIENT_RESOURCES);
tduffy> + return DAT_INSUFFICIENT_RESOURCES;
tduffy> }
tduffy> }
tduffy>
tduffy> Index: linux-kernel-return/dat-provider/dapl_ring_buffer_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-return/dat-provider/dapl_ring_buffer_util.c (revision 2382)
tduffy> +++ linux-kernel-return/dat-provider/dapl_ring_buffer_util.c (working copy)
tduffy> @@ -237,7 +237,7 @@ void *dapl_rbuf_remove(DAPL_RING_BUFFER
tduffy> if (val == pos) {
tduffy> pos = (pos + 1) & rbuf->lim; /* verify in range */
tduffy>
tduffy> - return (rbuf->base[pos]);
tduffy> + return rbuf->base[pos];
tduffy> }
tduffy> }
tduffy>
tduffy> Index: linux-kernel-return/dat-provider/dapl_lmr_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-return/dat-provider/dapl_lmr_util.c (revision 2382)
tduffy> +++ linux-kernel-return/dat-provider/dapl_lmr_util.c (working copy)
tduffy> @@ -50,7 +50,7 @@ DAPL_LMR *dapl_lmr_alloc(DAPL_IA * ia,
tduffy> /* Allocate LMR */
tduffy> lmr = (DAPL_LMR *) kmalloc(sizeof(DAPL_LMR), GFP_ATOMIC);
tduffy> if (NULL == lmr) {
tduffy> - return (NULL);
tduffy> + return NULL;
tduffy> }
tduffy>
tduffy> /* zero the structure */
tduffy> @@ -80,7 +80,7 @@ DAPL_LMR *dapl_lmr_alloc(DAPL_IA * ia,
tduffy> lmr->param.mem_priv = mem_priv;
tduffy> atomic_set(&lmr->lmr_ref_count, 0);
tduffy>
tduffy> - return (lmr);
tduffy> + return lmr;
tduffy> }
tduffy>
tduffy> void dapl_lmr_dealloc(DAPL_LMR * lmr)
tduffy> Index: linux-kernel-return/dat-provider/dapl_hca_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-return/dat-provider/dapl_hca_util.c (revision 2382)
tduffy> +++ linux-kernel-return/dat-provider/dapl_hca_util.c (working copy)
tduffy> @@ -83,7 +83,7 @@ DAPL_HCA *dapl_hca_alloc(char *name, str
tduffy> }
tduffy> }
tduffy>
tduffy> - return (hca_ptr);
tduffy> + return hca_ptr;
tduffy> }
tduffy>
tduffy> /*
tduffy> Index: linux-kernel-return/dat-provider/dapl_cr_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-return/dat-provider/dapl_cr_util.c (revision 2382)
tduffy> +++ linux-kernel-return/dat-provider/dapl_cr_util.c (working copy)
tduffy> @@ -44,7 +44,7 @@ DAPL_CR *dapl_cr_alloc(DAPL_IA * ia_ptr)
tduffy> /* Allocate EP */
tduffy> cr_ptr = (DAPL_CR *) kmalloc(sizeof(DAPL_CR), GFP_ATOMIC);
tduffy> if (cr_ptr == NULL) {
tduffy> - return (NULL);
tduffy> + return NULL;
tduffy> }
tduffy>
tduffy> /* zero the structure */
tduffy> @@ -62,7 +62,7 @@ DAPL_CR *dapl_cr_alloc(DAPL_IA * ia_ptr)
tduffy> dapl_llist_init_entry(&cr_ptr->header.ia_list_entry);
tduffy> spin_lock_init(&cr_ptr->header.lock);
tduffy>
tduffy> - return (cr_ptr);
tduffy> + return cr_ptr;
tduffy> }
tduffy>
tduffy> /*
tduffy> Index: linux-kernel-return/dat-provider/dapl_ia_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-return/dat-provider/dapl_ia_util.c (revision 2382)
tduffy> +++ linux-kernel-return/dat-provider/dapl_ia_util.c (working copy)
tduffy> @@ -65,7 +65,7 @@ DAPL_IA *dapl_ia_alloc(struct dat_provid
tduffy> /* Allocate IA */
tduffy> ia_ptr = (DAPL_IA *) kmalloc(sizeof(DAPL_IA), GFP_ATOMIC);
tduffy> if (ia_ptr == NULL) {
tduffy> - return (NULL);
tduffy> + return NULL;
tduffy> }
tduffy>
tduffy> /* zero the structure */
tduffy> @@ -100,7 +100,7 @@ DAPL_IA *dapl_ia_alloc(struct dat_provid
tduffy>
tduffy> dapl_hca_link_ia(hca_ptr, ia_ptr);
tduffy>
tduffy> - return (ia_ptr);
tduffy> + return ia_ptr;
tduffy> }
tduffy>
tduffy> /*
tduffy> Index: linux-kernel-return/dat-provider/dapl_pz_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-return/dat-provider/dapl_pz_util.c (revision 2382)
tduffy> +++ linux-kernel-return/dat-provider/dapl_pz_util.c (working copy)
tduffy> @@ -59,7 +59,7 @@ DAPL_PZ *dapl_pz_alloc(DAPL_IA * ia)
tduffy> /* Allocate PZ */
tduffy> pz = (DAPL_PZ *) kmalloc(sizeof(DAPL_PZ), GFP_ATOMIC);
tduffy> if (NULL == pz) {
tduffy> - return (NULL);
tduffy> + return NULL;
tduffy> }
tduffy>
tduffy> /* zero the structure */
tduffy> @@ -83,7 +83,7 @@ DAPL_PZ *dapl_pz_alloc(DAPL_IA * ia)
tduffy> */
tduffy> atomic_set(&pz->pz_ref_count, 0);
tduffy>
tduffy> - return (pz);
tduffy> + return pz;
tduffy> }
tduffy>
tduffy> /*
tduffy> Index: linux-kernel-return/dat-provider/dapl_openib_cm.c
tduffy> ===================================================================
tduffy> --- linux-kernel-return/dat-provider/dapl_openib_cm.c (revision 2382)
tduffy> +++ linux-kernel-return/dat-provider/dapl_openib_cm.c (working copy)
tduffy> @@ -844,7 +844,7 @@ u32 dapl_ib_cm_remote_addr(DAT_HANDLE da
tduffy>
tduffy> rc = ib_cm_get_remote_gid(cr_ptr->ib_cm_handle, (u8 *) & remote_gid);
tduffy> if (rc < 0)
tduffy> - return (rc);
tduffy> + return rc;
tduffy>
tduffy> if (!memcmp(&ia_ptr->hca_ptr->ib_trans.gid, &remote_gid, 16)) {
tduffy> memcpy(remote_ia_address, &ia_ptr->hca_ptr->hca_address,
tduffy> Index: linux-kernel-return/dat-provider/dapl_openib_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-return/dat-provider/dapl_openib_util.c (revision 2382)
tduffy> +++ linux-kernel-return/dat-provider/dapl_openib_util.c (working copy)
tduffy> @@ -334,7 +334,7 @@ u32 dapl_ib_pd_alloc(DAPL_IA *ia, DAPL_P
tduffy> }
tduffy>
tduffy> pz->pd_handle = (ib_pd_handle_t) pd;
tduffy> - return (DAT_SUCCESS);
tduffy> + return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> /*
tduffy> @@ -367,7 +367,7 @@ u32 dapl_ib_pd_free(DAPL_PZ *pz)
tduffy> }
tduffy>
tduffy> pz->pd_handle = IB_INVALID_HANDLE;
tduffy> - return (DAT_SUCCESS);
tduffy> + return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> /*
tduffy> @@ -393,7 +393,7 @@ u32 dapl_ib_mr_register(DAPL_IA *ia, DAP
tduffy> u64 length, enum dat_mem_priv_flags privileges)
tduffy> {
tduffy> /* ITBD virtual memory registration ??? */
tduffy> - return (DAT_SUCCESS);
tduffy> + return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> u32 dapl_ib_mr_register_physical(DAPL_IA *ia_ptr, DAPL_LMR *lmr,
tduffy> @@ -452,7 +452,7 @@ u32 dapl_ib_mr_register_physical(DAPL_IA
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_UTIL,
tduffy> "dapl_ib_mr_register_physical(%p %d) got lkey 0x%x \n",
tduffy> buf_list, length, lmr->param.lmr_context);
tduffy> - return (DAT_SUCCESS);
tduffy> + return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> /*
tduffy> @@ -486,7 +486,7 @@ u32 dapl_ib_mr_deregister(DAPL_LMR *lmr)
tduffy> lmr->param.lmr_context = 0;
tduffy> lmr->mr_handle = IB_INVALID_HANDLE;
tduffy>
tduffy> - return (DAT_SUCCESS);
tduffy> + return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> /*
tduffy> @@ -523,7 +523,7 @@ u32 dapl_ib_mw_alloc(DAPL_RMR *rmr)
tduffy> rmr->param.rmr_context = mw->rkey;
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_UTIL,
tduffy> "created mw_handle = %p, r_key = 0x%x\n", mw, mw->rkey);
tduffy> - return (DAT_SUCCESS);
tduffy> + return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> /*
tduffy> @@ -556,7 +556,7 @@ u32 dapl_ib_mw_free(DAPL_RMR *rmr)
tduffy>
tduffy> rmr->param.rmr_context = 0;
tduffy> rmr->mw_handle = IB_INVALID_HANDLE;
tduffy> - return (DAT_SUCCESS);
tduffy> + return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> /*
tduffy> @@ -601,13 +601,13 @@ u32 dapl_ib_mw_bind(DAPL_RMR *rmr, DAPL_
tduffy> if (ib_status < 0) {
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_ERR,
tduffy> "ib_bind_mw error code return = %d\n", ib_status);
tduffy> - return (dapl_ib_status_convert(ib_status));
tduffy> + return dapl_ib_status_convert(ib_status);
tduffy> }
tduffy>
tduffy> rmr->param.rmr_context = (DAT_RMR_CONTEXT) rmr->mw_handle->rkey;
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_UTIL, " new_rkey = 0x%x\n",
tduffy> rmr->mw_handle->rkey);
tduffy> - return (DAT_SUCCESS);
tduffy> + return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> /*
tduffy> @@ -643,13 +643,13 @@ u32 dapl_ib_mw_unbind(DAPL_RMR *rmr, DAP
tduffy> if (ib_status < 0) {
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_ERR,
tduffy> " ib_bind_mw error code return = %d\n", ib_status);
tduffy> - return (dapl_ib_status_convert(ib_status));
tduffy> + return dapl_ib_status_convert(ib_status);
tduffy> }
tduffy>
tduffy> rmr->param.rmr_context = (DAT_RMR_CONTEXT) rmr->mw_handle->rkey;
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_UTIL, " new_rkey = 0x%x\n",
tduffy> rmr->mw_handle->rkey);
tduffy> - return (DAT_SUCCESS);
tduffy> + return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> /*
tduffy> @@ -709,7 +709,7 @@ u32 dapl_ib_query_hca(DAPL_HCA *hca_ptr,
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_ERR,
tduffy> " ib_query_device error code return = %d\n",
tduffy> ib_status);
tduffy> - return (dapl_ib_status_convert(ib_status));
tduffy> + return dapl_ib_status_convert(ib_status);
tduffy> }
tduffy>
tduffy> /* ITBD need to review the attr */
tduffy> Index: linux-kernel-return/dat-provider/dapl_rmr_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-return/dat-provider/dapl_rmr_util.c (revision 2382)
tduffy> +++ linux-kernel-return/dat-provider/dapl_rmr_util.c (working copy)
tduffy> @@ -35,7 +35,7 @@ DAPL_RMR *dapl_rmr_alloc(DAPL_PZ * pz)
tduffy> /* Allocate LMR */
tduffy> rmr = (DAPL_RMR *) kmalloc(sizeof(DAPL_RMR), GFP_ATOMIC);
tduffy> if (NULL == rmr) {
tduffy> - return (NULL);
tduffy> + return NULL;
tduffy> }
tduffy>
tduffy> /* zero the structure */
tduffy> @@ -68,7 +68,7 @@ DAPL_RMR *dapl_rmr_alloc(DAPL_PZ * pz)
tduffy> rmr->pz = pz;
tduffy> rmr->lmr = NULL;
tduffy>
tduffy> - return (rmr);
tduffy> + return rmr;
tduffy> }
tduffy>
tduffy> void dapl_rmr_dealloc(DAPL_RMR * rmr)
tduffy> Index: linux-kernel-return/dat-provider/dapl_sp_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-return/dat-provider/dapl_sp_util.c (revision 2382)
tduffy> +++ linux-kernel-return/dat-provider/dapl_sp_util.c (working copy)
tduffy> @@ -66,7 +66,7 @@ DAPL_SP *dapl_sp_alloc(DAPL_IA * ia_ptr,
tduffy> /* Allocate EP */
tduffy> sp_ptr = (DAPL_SP *) kmalloc(sizeof(DAPL_SP), GFP_ATOMIC);
tduffy> if (sp_ptr == NULL) {
tduffy> - return (NULL);
tduffy> + return NULL;
tduffy> }
tduffy>
tduffy> /* zero the structure */
tduffy> @@ -94,7 +94,7 @@ DAPL_SP *dapl_sp_alloc(DAPL_IA * ia_ptr,
tduffy> */
tduffy> dapl_llist_init_head(&sp_ptr->cr_list_head);
tduffy>
tduffy> - return (sp_ptr);
tduffy> + return sp_ptr;
tduffy> }
tduffy>
tduffy> /*
tduffy> Index: linux-kernel-return/dat-provider/dapl_llist.c
tduffy> ===================================================================
tduffy> --- linux-kernel-return/dat-provider/dapl_llist.c (revision 2382)
tduffy> +++ linux-kernel-return/dat-provider/dapl_llist.c (working copy)
tduffy> @@ -198,7 +198,7 @@ void *dapl_llist_remove_head(DAPL_LLIST_
tduffy> first->flink = NULL;
tduffy> first->blink = NULL;
tduffy> first->list_head = NULL;
tduffy> - return (first->data);
tduffy> + return first->data;
tduffy> }
tduffy>
tduffy> /*
tduffy> @@ -224,7 +224,7 @@ void *dapl_llist_remove_tail(DAPL_LLIST_
tduffy> last->blink = NULL;
tduffy> last->list_head = NULL;
tduffy>
tduffy> - return (last->data);
tduffy> + return last->data;
tduffy> }
tduffy>
tduffy> /*
tduffy> @@ -274,7 +274,7 @@ void *dapl_llist_remove_entry(DAPL_LLIST
tduffy> entry->flink = NULL;
tduffy> entry->blink = NULL;
tduffy>
tduffy> - return (entry->data);
tduffy> + return entry->data;
tduffy> }
tduffy>
tduffy> /*
tduffy> @@ -287,7 +287,7 @@ void *dapl_llist_peek_head(DAPL_LLIST_HE
tduffy>
tduffy> dapl_os_assert(!dapl_llist_is_empty(head));
tduffy> first = *head;
tduffy> - return (first->data);
tduffy> + return first->data;
tduffy> }
tduffy>
tduffy> /*
tduffy> @@ -310,7 +310,7 @@ void *dapl_llist_next_entry(DAPL_LLIST_H
tduffy> return NULL;
tduffy> }
tduffy> }
tduffy> - return (next->data);
tduffy> + return next->data;
tduffy> }
tduffy>
tduffy> #ifdef DAPL_DBG
tduffy>
More information about the general
mailing list