Unverified Commit 34f76c43 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7607 Fix allmodconfig build error 

Merge Pull Request from: @ci-robot 
 
PR sync from: Shuai Wu <wushuai51@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CLDGHINVYZVY727C3TTLED2STQQZNYS4/ 
Fix allmodconfig build error in hiroce3 driver.

Shuai Wu (1):
  net/ethernet/huawei/hiroce3: Fix allmodconfig build error


-- 
2.33.0
 
https://gitee.com/openeuler/kernel/issues/I9QSGL 
 
Link:https://gitee.com/openeuler/kernel/pulls/7607

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 39023e2d ade2ed30

drivers/infiniband/hw/hiroce3/bond/roce_bond_common.c

+20 −18
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ int roce3_bond_is_eth_port_of_netdev(struct roce3_device *rdev, struct net_devic 
	return 0;

}



struct roce3_bond_device *roce3_get_bond_dev(const char *bond_name)

static struct roce3_bond_device *roce3_get_bond_dev(const char *bond_name)

{

	struct roce3_bond_device *bdev = NULL;
@@ -430,7 +430,7 @@ struct roce3_bond_device *roce3_get_bond_dev(const char *bond_name) 
	return NULL;

}



struct roce3_bond_device *roce3_get_bond_dev_by_name(const char *bond_name)

static struct roce3_bond_device *roce3_get_bond_dev_by_name(const char *bond_name)

{

	struct roce3_bond_device *bdev = NULL;
@@ -440,8 +440,8 @@ struct roce3_bond_device *roce3_get_bond_dev_by_name(const char *bond_name) 
	return bdev;

}



void roce3_bond_init_slave(struct roce3_bond_slave *slave, struct bond_tracker *tracker, int index,

	struct bond_attr *attr)

static void roce3_bond_init_slave(struct roce3_bond_slave *slave,

				  struct bond_tracker *tracker, int index, struct bond_attr *attr)

{

	void *hwdev;
@@ -465,7 +465,7 @@ void roce3_bond_init_slave(struct roce3_bond_slave *slave, struct bond_tracker * 
		hinic3_detach_service(slave->lld_dev, SERVICE_T_ROCE);

}



bool roce3_bond_before_active_check(struct bond_tracker *tracker, struct bond_attr *attr)

static bool roce3_bond_before_active_check(struct bond_tracker *tracker, struct bond_attr *attr)

{

	int i;

	struct hinic3_lld_dev *lld_dev = NULL;
@@ -501,7 +501,7 @@ bool roce3_bond_before_active_check(struct bond_tracker *tracker, struct bond_at 
	return true;

}



void roce3_detach_nic_bond_work(struct work_struct *work)

static void roce3_detach_nic_bond_work(struct work_struct *work)

{

	struct roce3_detach_work *detach_work = container_of(work, struct roce3_detach_work, work);
@@ -520,7 +520,8 @@ static void roce3_attach_bond_work(struct work_struct *_work) 


	kfree(work);

}

void roce3_deatch_bond(u16 bond_id)



static void roce3_deatch_bond(u16 bond_id)

{

	struct roce3_detach_work *detach_work = NULL;
@@ -533,7 +534,7 @@ void roce3_deatch_bond(u16 bond_id) 
	queue_work(g_bond_wq, &detach_work->work);

}



bool roce3_bond_tracker_get(const char *bond_name, struct bond_tracker *tracker)

static bool roce3_bond_tracker_get(const char *bond_name, struct bond_tracker *tracker)

{

	int ret = 0;
@@ -555,7 +556,7 @@ bool roce3_bond_tracker_get(const char *bond_name, struct bond_tracker *tracker) 
	return false;

}



void roce3_before_bond_active(const char *bond_name, struct bond_attr *attr)

static void roce3_before_bond_active(const char *bond_name, struct bond_attr *attr)

{

	struct roce3_bond_device *bond_dev = NULL;

	struct roce3_bond_slave *slave = NULL;
@@ -602,7 +603,7 @@ void roce3_before_bond_active(const char *bond_name, struct bond_attr *attr) 
	roce3_deatch_bond(attr->bond_id);

}



void roce3_after_bond_active(const char *bond_name, struct bond_attr *attr)

static void roce3_after_bond_active(const char *bond_name, struct bond_attr *attr)

{

	int ret;

	struct roce3_bond_device *bond_dev = NULL;
@@ -620,7 +621,7 @@ void roce3_after_bond_active(const char *bond_name, struct bond_attr *attr) 
	}

}



void roce3_after_bond_modify(const char *bond_name, struct bond_attr *attr)

static void roce3_after_bond_modify(const char *bond_name, struct bond_attr *attr)

{

	struct roce3_bond_device *bond_dev = NULL;

	struct bond_tracker tracker;
@@ -654,15 +655,15 @@ void roce3_after_bond_modify(const char *bond_name, struct bond_attr *attr) 
	mutex_unlock(&bond_dev->slave_lock);

}



void roce3_before_bond_deactive(const char *bond_name, struct bond_attr *attr)

static void roce3_before_bond_deactive(const char *bond_name, struct bond_attr *attr)

{

}



void roce3_after_bond_deactive(const char *bond_name, struct bond_attr *attr)

static void roce3_after_bond_deactive(const char *bond_name, struct bond_attr *attr)

{

}



void roce3_bond_destroy(const char *bond_name)

static void roce3_bond_destroy(const char *bond_name)

{

	int ret;

	int i;
@@ -702,7 +703,7 @@ void roce3_bond_destroy(const char *bond_name) 
	kfree(bond_dev);

}



void roce3_before_bond_modify(const char *bond_name, struct bond_attr *attr)

static void roce3_before_bond_modify(const char *bond_name, struct bond_attr *attr)

{

	struct roce3_bond_device *bond_dev = NULL;

	struct bond_tracker tracker;
@@ -751,7 +752,8 @@ static roce3_bond_service_func g_roce3_bond_proc[] = { 
	roce3_after_bond_deactive,

};



void roce3_bond_service_proc(const char *bond_name, void *bond_attr, enum bond_service_proc_pos pos)

static void roce3_bond_service_proc(const char *bond_name,

				    void *bond_attr, enum bond_service_proc_pos pos)

{

	struct bond_attr *attr = (struct bond_attr *)bond_attr;
@@ -807,7 +809,7 @@ static void roce3_detach_bond_work(struct work_struct *_work) 
	kfree(work);

}



void roce3_queue_bond_work(struct net_device *upper_netdev, work_func_t func)

static void roce3_queue_bond_work(struct net_device *upper_netdev, work_func_t func)

{

	struct roce3_bond_work *work;

	struct bonding *bond = netdev_priv(upper_netdev);
@@ -826,7 +828,7 @@ void roce3_queue_bond_work(struct net_device *upper_netdev, work_func_t func) 
	queue_work(g_bond_wq, &work->work);

}



int roce3_bond_netdev_event(struct notifier_block *this, unsigned long event, void *ptr)

static int roce3_bond_netdev_event(struct notifier_block *this, unsigned long event, void *ptr)

{

	struct net_device *net_dev = NULL;

	struct netdev_notifier_changeupper_info *info = NULL;

drivers/infiniband/hw/hiroce3/cq/roce_cq_destroy.c

+1 −14
Original line number Diff line number Diff line
@@ -47,20 +47,7 @@ static int roce3_check_cqc_data_state(struct roce3_device *rdev, const struct ro 
	return 0;

}



/*

 ****************************************************************************

 Prototype	: roce3_cq_hw2sw

 Description  : roce3_cq_hw2sw

 Input		: struct roce3_device *rdev

				struct roce3_cq *cq

 Output	   : None



  1.Date		 : 2015/5/27

	Modification : Created function



****************************************************************************

*/

int roce3_cq_hw2sw(struct roce3_device *rdev, struct roce3_cq *cq)

static int roce3_cq_hw2sw(struct roce3_device *rdev, struct roce3_cq *cq)

{

	int ret;

	struct tag_cqm_cmd_buf *cqm_cmd_inbuf = NULL;

drivers/infiniband/hw/hiroce3/host/hmm/hmm_comp_mtt.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include "hinic3_hw.h"

#include "hinic3_rdma.h"

#include "hmm_comp.h"

#include "hinic3_hmm.h"

#include "hmm_mr.h"



static int hmm_set_mtt_layer(const struct hmm_comp_priv *comp_priv,

drivers/infiniband/hw/hiroce3/host/hmm/hmm_comp_mw_mr.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


#include "hinic3_hw.h"

#include "hmm_comp.h"

#include "hmm_mr.h"



static void hmm_roce_mpt_to_big_endian(struct roce_mpt_context *mpt_ctx)

{

drivers/infiniband/hw/hiroce3/host/hmm/hmm_comp_res.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


#include "hinic3_hw.h"

#include "hmm_comp.h"

#include "hmm_mr.h"



int hmm_rdma_mpt_alloc(void *hwdev, struct rdma_mpt *mpt, u32 service_type)

{