qed: Make qed_iov_mark_vf_flr() return bool (cccf6f5c) · Commits · 戴 / test

drivers/net/ethernet/qlogic/qed/qed_sriov.c

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -3138,9 +3138,10 @@ qed_iov_vf_flr_cleanup(struct qed_hwfn p_hwfn, struct qed_ptt p_ptt)
	return rc;		return rc;
	}		}

	int qed_iov_mark_vf_flr(struct qed_hwfn p_hwfn, u32 p_disabled_vfs)		bool qed_iov_mark_vf_flr(struct qed_hwfn p_hwfn, u32 p_disabled_vfs)
	{		{
	u16 i, found = 0;		bool found = false;
			u16 i;

	DP_VERBOSE(p_hwfn, QED_MSG_IOV, "Marking FLR-ed VFs\n");		DP_VERBOSE(p_hwfn, QED_MSG_IOV, "Marking FLR-ed VFs\n");
	for (i = 0; i < (VF_MAX_STATIC / 32); i++)		for (i = 0; i < (VF_MAX_STATIC / 32); i++)
	@@ -3150,7 +3151,7 @@ int qed_iov_mark_vf_flr(struct qed_hwfn p_hwfn, u32 p_disabled_vfs)

	if (!p_hwfn->cdev->p_iov_info) {		if (!p_hwfn->cdev->p_iov_info) {
	DP_NOTICE(p_hwfn, "VF flr but no IOV\n");		DP_NOTICE(p_hwfn, "VF flr but no IOV\n");
	return 0;		return false;
	}		}

	/* Mark VFs */		/* Mark VFs */
	@@ -3179,7 +3180,7 @@ int qed_iov_mark_vf_flr(struct qed_hwfn p_hwfn, u32 p_disabled_vfs)
	* VF flr until ACKs, we're safe.		* VF flr until ACKs, we're safe.
	*/		*/
	p_flr[rel_vf_id / 64] \|= 1ULL << (rel_vf_id % 64);		p_flr[rel_vf_id / 64] \|= 1ULL << (rel_vf_id % 64);
	found = 1;		found = true;
	}		}
	}		}

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -348,9 +348,9 @@ int qed_sriov_eqe_event(struct qed_hwfn *p_hwfn,
	* @param p_hwfn		* @param p_hwfn
	* @param disabled_vfs - bitmask of all VFs on path that were FLRed		* @param disabled_vfs - bitmask of all VFs on path that were FLRed
	*		*
	* @return 1 iff one of the PF's vfs got FLRed. 0 otherwise.		* @return true iff one of the PF's vfs got FLRed. false otherwise.
	*/		*/
	int qed_iov_mark_vf_flr(struct qed_hwfn p_hwfn, u32 disabled_vfs);		bool qed_iov_mark_vf_flr(struct qed_hwfn p_hwfn, u32 disabled_vfs);

	/**		/**
	* @brief Search extended TLVs in request/reply buffer.		* @brief Search extended TLVs in request/reply buffer.
	@@ -407,10 +407,10 @@ static inline int qed_sriov_eqe_event(struct qed_hwfn *p_hwfn,
	return -EINVAL;		return -EINVAL;
	}		}

	static inline int qed_iov_mark_vf_flr(struct qed_hwfn *p_hwfn,		static inline bool qed_iov_mark_vf_flr(struct qed_hwfn *p_hwfn,
	u32 *disabled_vfs)		u32 *disabled_vfs)
	{		{
	return 0;		return false;
	}		}

	static inline void qed_iov_wq_stop(struct qed_dev *cdev, bool schedule_first)		static inline void qed_iov_wq_stop(struct qed_dev *cdev, bool schedule_first)