diff options
Diffstat (limited to 'drivers/infiniband/hw/ocrdma')
| -rw-r--r-- | drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 3 | ||||
| -rw-r--r-- | drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 4 | ||||
| -rw-r--r-- | drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 7 | ||||
| -rw-r--r-- | drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 4 | 
4 files changed, 9 insertions, 9 deletions
| diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c index 797362a297b2..14d33b0f3950 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c @@ -154,7 +154,8 @@ static inline int set_av_attr(struct ocrdma_dev *dev, struct ocrdma_ah *ah,  	return status;  } -struct ib_ah *ocrdma_create_ah(struct ib_pd *ibpd, struct ib_ah_attr *attr) +struct ib_ah *ocrdma_create_ah(struct ib_pd *ibpd, struct ib_ah_attr *attr, +			       struct ib_udata *udata)  {  	u32 *ahid_addr;  	int status; diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_ah.h b/drivers/infiniband/hw/ocrdma/ocrdma_ah.h index 3856dd4c7e3d..0704a24b17c8 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_ah.h +++ b/drivers/infiniband/hw/ocrdma/ocrdma_ah.h @@ -50,7 +50,9 @@ enum {  	OCRDMA_AH_L3_TYPE_MASK		= 0x03,  	OCRDMA_AH_L3_TYPE_SHIFT		= 0x1D /* 29 bits */  }; -struct ib_ah *ocrdma_create_ah(struct ib_pd *, struct ib_ah_attr *); + +struct ib_ah *ocrdma_create_ah(struct ib_pd *, struct ib_ah_attr *, +			       struct ib_udata *);  int ocrdma_destroy_ah(struct ib_ah *);  int ocrdma_query_ah(struct ib_ah *, struct ib_ah_attr *);  int ocrdma_modify_ah(struct ib_ah *, struct ib_ah_attr *); diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c index 67fc0b6857e1..9a305201545e 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c @@ -1596,10 +1596,9 @@ void ocrdma_alloc_pd_pool(struct ocrdma_dev *dev)  	dev->pd_mgr = kzalloc(sizeof(struct ocrdma_pd_resource_mgr),  			      GFP_KERNEL); -	if (!dev->pd_mgr) { -		pr_err("%s(%d)Memory allocation failure.\n", __func__, dev->id); +	if (!dev->pd_mgr)  		return; -	} +  	status = ocrdma_mbx_alloc_pd_range(dev);  	if (status) {  		pr_err("%s(%d) Unable to initialize PD pool, using default.\n", @@ -1642,7 +1641,7 @@ static int ocrdma_build_q_conf(u32 *num_entries, int entry_size,  static int ocrdma_mbx_create_ah_tbl(struct ocrdma_dev *dev)  {  	int i; -	int status = 0; +	int status = -ENOMEM;  	int max_ah;  	struct ocrdma_create_ah_tbl *cmd;  	struct ocrdma_create_ah_tbl_rsp *rsp; diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_stats.c b/drivers/infiniband/hw/ocrdma/ocrdma_stats.c index 8bef09a8c49f..f8e4b0a6486f 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_stats.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_stats.c @@ -84,10 +84,8 @@ bool ocrdma_alloc_stats_resources(struct ocrdma_dev *dev)  	/* Alloc debugfs mem */  	mem->debugfs_mem = kzalloc(OCRDMA_MAX_DBGFS_MEM, GFP_KERNEL); -	if (!mem->debugfs_mem) { -		pr_err("%s: stats debugfs mem allocation failed\n", __func__); +	if (!mem->debugfs_mem)  		return false; -	}  	return true;  } |