From patchwork Sat Oct 23 09:26:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?J=CE=B5an_Sacren?= X-Patchwork-Id: 12579353 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3635DC433EF for ; Sat, 23 Oct 2021 09:26:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0156F60D07 for ; Sat, 23 Oct 2021 09:26:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230034AbhJWJ2n (ORCPT ); Sat, 23 Oct 2021 05:28:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229908AbhJWJ2n (ORCPT ); Sat, 23 Oct 2021 05:28:43 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25916C061764 for ; Sat, 23 Oct 2021 02:26:24 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id d3so413824edp.3 for ; Sat, 23 Oct 2021 02:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=umoDlPDF0Z9LWOPG1G9yeEVh2KZ9i5XqGYFFYsZfcsI=; b=czC6vM3WHq8Fbtt8WeoqB4KnJbBYckPAqs666a8H9BsjUDD7P9kC8EQRb20NXK9G8I fs0WONCpBFN3JyK7UxrS7wcZh5YSwQnHpKs1+twZ7CWdKwSmOdPTsw6l1IL6oStnMFuT ka08342RmFpy1ZjyT+uvdmb3PlluyI+s7hI/xRgqiO91m3JaSdAExwxrfNEO6cHsc9BG GJSDR7nxYBtEBLUxThn8pn0bmQO5t/PaUA0k1J5WDE1PYFI6QebIRUHKbV2DjwMJpOBq KP2YXUg/A8D9j7tuVTEyYmBxAEqA9lY5CEmh8mCofjnwlxDKKveq8BBXz+eITYCNspXi VA/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=umoDlPDF0Z9LWOPG1G9yeEVh2KZ9i5XqGYFFYsZfcsI=; b=PjuTZXbrNG9gyPZhuKqbwfbS/VzU9Q8oTVNBiXOl2jyz/CZEDUZt9/0hb363D5VyHe pkM4toHK6SCL9OogcoL4eAUTN3P24KYtQPzStgWSEGjvdv5rotpQwR7/2oJ9GZSz1PG7 iYcf3Bso8o7MwIpDSYNlI8xbUeyHHIkeaQgk1xVB85rafP0gTM/nvMicKa1eUGFBkg/m phPklhuanzeIVVrXwBfNo5RYjTrzrafNqGjXOEPCPt5Jcd9PDJr6KeSilLNUqaP8op2y GGp6xhfZ0SfUskswq6NACmcwJzigFI5J7UqAu7UPtA5eBsVzMqm7AVud3bSdy2ltI9Xu KZ+Q== X-Gm-Message-State: AOAM530Zw/+dCAgIJTkvIKEJxkwP5yZzvjrwp9XU8TILqqzqumHcWoiK ySB4wMyoO83AEioDGlbTCLWzuoIa5Bs= X-Google-Smtp-Source: ABdhPJxhpzKB3k9KsJslChMVIt9O1ol9SinH6/L+YpzqqV3lLIJfglRnEOFkoNynLXoHsv3OonaDyw== X-Received: by 2002:a17:906:3ce:: with SMTP id c14mr401867eja.102.1634981182800; Sat, 23 Oct 2021 02:26:22 -0700 (PDT) Received: from localhost ([185.31.175.215]) by smtp.gmail.com with ESMTPSA id n24sm5756162edb.28.2021.10.23.02.26.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Oct 2021 02:26:22 -0700 (PDT) From: =?utf-8?q?J=CE=B5an_Sacren?= To: Ariel Elior Cc: GR-everest-linux-l2@marvell.com, davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Subject: [PATCH net-next 1/2] net: qed_ptp: fix check of true !rc expression Date: Sat, 23 Oct 2021 03:26:14 -0600 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Jean Sacren 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 --- drivers/net/ethernet/qlogic/qed/qed_ptp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) From patchwork Sat Oct 23 09:26:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?J=CE=B5an_Sacren?= X-Patchwork-Id: 12579355 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2D89C433EF for ; Sat, 23 Oct 2021 09:26:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B0AF761057 for ; Sat, 23 Oct 2021 09:26:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230074AbhJWJ2u (ORCPT ); Sat, 23 Oct 2021 05:28:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229908AbhJWJ2t (ORCPT ); Sat, 23 Oct 2021 05:28:49 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F156C061764 for ; Sat, 23 Oct 2021 02:26:30 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id r4so2360917edi.5 for ; Sat, 23 Oct 2021 02:26:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Pnvj9w+N6cYaQeza77luUvf5BBAXfB2qtISkL7r812s=; b=NTBl8jR4/NH8W+UY1qeSs+KzSQ6KEL8rWF4tMeVfcw67KqMlvEilk8B6auBIHnHnDr Lu/sy0BvJpdKvoJ98734c/qwOXoJ/cktECN8jtQQQsTyPJ1Nq3Qk+u/uzR4nOT9l+lZ6 oSBkiIs3vrXhqksgSLagvqLzVeyNlyGRc8ZZ9z89V8KNqpu0ocKGh8LXvGcTMUROeeGo iLO7ishpRvncSZUFFHGRerkS+L3VUTHGfEDUiAKLLsEmCHH1MP/pEi/qxFQQIwLczOfV B2iPFAEbpFQu1cOfTtw2K/TkbHmoyCItFWyMahxfHMKzzZ4LbsACfNO5ZVtiJnIoB4VC ERKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Pnvj9w+N6cYaQeza77luUvf5BBAXfB2qtISkL7r812s=; b=LryvnjLGSCFxuFqWrbwLVHGnFUBHjHvtR4kJrKim/P922mvcYLZ0bvYRipMD+xtOpj mORHkTveo0uzxwDveBVe4Uryr398Oua/rnQ+E7XU6pDIs6aJe4uO/DzN1GGFDtuamMIO Dd7RthCLi6CkdpL1OzydY4VLQEGgcB3gyt17xdG9XkbRTxU0BylkGMtiI/M12OY0bYIu 8UTevU3DuqPT8lfvEDOh9wUfGWa7U4JpcnOkktHx4vI1CH7Pxyu5uusGro07E+TUzQ0+ RJ+00bWjjtLz6o2RfzLx2mgtnL6mJ95u8S78wgCcrC+9//gwrs0TA9qCR2Yi7+jDiTs4 h/rg== X-Gm-Message-State: AOAM530Zj7YMgt+YaqBqAABEsJwQYDsmohXqktuP6SjUxE2+eKzbTSnz NxyIdtUIAlfArpB50FwJWw0= X-Google-Smtp-Source: ABdhPJyPgPkAdI9Cc+UTRLNAwFsTHJiQN5y8ecZOeGx46kYbKwtYr1F8n6dN+sHAwjBKuAcTcSSUeA== X-Received: by 2002:a05:6402:2690:: with SMTP id w16mr7740460edd.372.1634981187191; Sat, 23 Oct 2021 02:26:27 -0700 (PDT) Received: from localhost ([185.31.175.215]) by smtp.gmail.com with ESMTPSA id f9sm5653611edy.9.2021.10.23.02.26.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Oct 2021 02:26:26 -0700 (PDT) From: =?utf-8?q?J=CE=B5an_Sacren?= To: Ariel Elior Cc: GR-everest-linux-l2@marvell.com, davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Subject: [PATCH net-next 2/2] net: qed_dev: fix check of true !rc expression Date: Sat, 23 Oct 2021 03:26:15 -0600 Message-Id: <6e14d07c53460c5da938832b92b4e6a193cd3c7a.1634974124.git.sakiwit@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Jean Sacren Remove the check of !rc in (!rc && !resc_lock_params.b_granted) since it is always true. Signed-off-by: Jean Sacren --- drivers/net/ethernet/qlogic/qed/qed_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c index 18f3bf7c4dfe..cc4ec2bb36db 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dev.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c @@ -3992,7 +3992,7 @@ static int qed_hw_get_resc(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) } else if (rc == -EINVAL) { DP_INFO(p_hwfn, "Skip the max values setting of the soft resources since the resource lock is not supported by the MFW\n"); - } else if (!rc && !resc_lock_params.b_granted) { + } else if (!resc_lock_params.b_granted) { DP_NOTICE(p_hwfn, "Failed to acquire the resource lock for the resource allocation commands\n"); return -EBUSY;