From: Jean Sacren Date: Sat, 23 Oct 2021 09:26:14 +0000 (-0600) Subject: net: qed_ptp: fix check of true !rc expression X-Git-Tag: v5.16-rc1~159^2~87^2~1 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=165f8e82c2f1fee914f43d5288f8bd08c7e0f69e;p=tomoyo%2Ftomoyo-test1.git net: qed_ptp: fix check of true !rc expression Remove the check of !rc in (!rc && !params.b_granted) since it is always true. We should also use constant 0 for return. Signed-off-by: Jean Sacren Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/ethernet/qlogic/qed/qed_ptp.c b/drivers/net/ethernet/qlogic/qed/qed_ptp.c index 2c62d732e5c2..295ce435a1a4 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_ptp.c +++ b/drivers/net/ethernet/qlogic/qed/qed_ptp.c @@ -63,12 +63,12 @@ static int qed_ptp_res_lock(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) DP_INFO(p_hwfn, "PF doesn't have lock ownership\n"); return -EBUSY; - } else if (!rc && !params.b_granted) { + } else if (!params.b_granted) { DP_INFO(p_hwfn, "Failed to acquire ptp resource lock\n"); return -EBUSY; } - return rc; + return 0; } static int qed_ptp_res_unlock(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)