From patchwork Tue Aug 1 12:04:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 13336622 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A20141F952 for ; Tue, 1 Aug 2023 12:04:48 +0000 (UTC) Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E07701FC6; Tue, 1 Aug 2023 05:04:30 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-4fbf09a9139so9019258e87.2; Tue, 01 Aug 2023 05:04:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690891469; x=1691496269; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=ADYcjyBt6vQx4AlVs0ouKVJ5yckCOkwBqZsdJ6ZjKOQ=; b=mNNs3VPnUFmoXBhLcSCDTGAThPOJlCg40STaqxQT3KJQbAsUU5vq7XDhY/5Wn2HooK 0eLJf+UXlnMF/NN4Ca+PX7/YfOK70km5ZTK7ApccfvC+GMmK6DEuFKUc+ZM4/wKW1pHk Z1CQI/ssPl5x2P3S77aPv+d5kBaiDjl2YW6ULtvXhnXtUBJ4HhPzRpkUmK2JZpRoKQEg vgUNJ1fEBEAbfDilZTKQ7JAaFj25hWDuLmtv3yH8jZ9j1KfNYDT2dqGS9oziBvm5Bjyw ULIQKckJOmZjXWNgq/jMnLg0v7nKja3DsCKqwgDrIdHE38Tm+TZu/PmdHCnbsJe3qKbi QvJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690891469; x=1691496269; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ADYcjyBt6vQx4AlVs0ouKVJ5yckCOkwBqZsdJ6ZjKOQ=; b=L1D5/MkyB8vhbWujOdYaknUE7NJYolnKuNGXo53vsejdXuVytkUGfB4nT5YfXJyWFN KKXhBWNCD3XdyYK+X94bHRj+Hz0BXhJ6g1O39pAdeUjGAPVYI+F/n0RiHWZJ6GkscXHW MVcvBUhOpY8b1cIiapNgoFQWNyPQMuxnJZdWWiHmeVKecScjM7sYH39kYYRa657nR4xp 3nHwUgNfKAeE2adgMs6Rvoj0Lli66GOE2eHZgTbZQrdVnz3J9pknx6czbJglEWZIkkpr Z9yoiu0fQE4Q/JGDqEeyKJGdkAPC7nvbzMu/BGKw6GXSEngnc0iKlqLuHsP6NxHB/Mxc 4D8w== X-Gm-Message-State: ABy/qLbl6W3FKTZ4L5eJfz7YTK3lVXiHwqJouKhMvjfADgP5HS+R+d2a p1FpDtORnueNckxrk4pXD7k= X-Google-Smtp-Source: APBJJlFOPb4UW9GNOSGxVwQ9anYiY/4gZVwpnu05QHHdDdmQk9tEoOUZfcMeR4k7UdHzogrmXAHqsg== X-Received: by 2002:ac2:5bd0:0:b0:4fe:3724:fdb1 with SMTP id u16-20020ac25bd0000000b004fe3724fdb1mr2202695lfn.41.1690891468655; Tue, 01 Aug 2023 05:04:28 -0700 (PDT) Received: from fedora ([213.255.186.46]) by smtp.gmail.com with ESMTPSA id m14-20020a056512014e00b004fe3229e584sm1157059lfo.270.2023.08.01.05.04.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Aug 2023 05:04:27 -0700 (PDT) Date: Tue, 1 Aug 2023 15:04:24 +0300 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Marcin Wojtas , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 7/8] net-next: mvpp2: relax return value check for IRQ get Message-ID: <9738e169d83a96f18de417e62b3cf4c20f51f885.1690890774.git.mazziesaccount@gmail.com> References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org fwnode_irq_get[_byname]() were changed to not return 0 anymore. Drop check for return value 0. Signed-off-by: Matti Vaittinen --- Revision history: v5 =>: - No changes v4 = v5: Fix the subject, mb1232 => mvpp2 The patch changing the fwnode_irq_get() got merged during 5.4: https://lore.kernel.org/all/fb7241d3-d1d1-1c37-919b-488d6d007484@gmail.com/ This is a clean-up as agreed. --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 1fec84b4c068..2632ffe91ca5 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -5833,7 +5833,7 @@ static int mvpp2_multi_queue_vectors_init(struct mvpp2_port *port, v->irq = of_irq_get_byname(port_node, irqname); else v->irq = fwnode_irq_get(port->fwnode, i); - if (v->irq <= 0) { + if (v->irq < 0) { ret = -EINVAL; goto err; } @@ -6764,7 +6764,7 @@ static int mvpp2_port_probe(struct platform_device *pdev, err = -EPROBE_DEFER; goto err_deinit_qvecs; } - if (port->port_irq <= 0) + if (port->port_irq < 0) /* the link irq is optional */ port->port_irq = 0; From patchwork Tue Aug 1 12:04:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 13336623 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 449DA1F952 for ; Tue, 1 Aug 2023 12:05:10 +0000 (UTC) Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8A8C199F; Tue, 1 Aug 2023 05:04:47 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-4fbf09a9139so9019673e87.2; Tue, 01 Aug 2023 05:04:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690891485; x=1691496285; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=lUSZxUxJVRcnvJ4sobFgXrYil73npapr2l2ITiQG0aI=; b=R4JtoyAC+ocWiuXRjDbII6S1UVzNDhm8T75KcU5zkLavGT3YPmIQ1W7juoNacFKZN/ iiiYgiTgNiFGoHbPBBMg25bqR0hStWyd01S2A9NrlhyQW3KMeV6p0+hJHxJjR12gxBy0 3YwEMKdKrPZK+3YX3RochuoUuQbTbx/LTP1RtgnIw14RsunfZplVmvCoBHUBNBNyJ6Gp k5dQ9HTpa1uVW61pHHA88E/lZfO66wAe41nMRBzDR++yUghbBTzU5VpUNOWD8dgRUsXi 4gqWOVCkfP4/5elSfpaGenGVHrSGaBfJMb5eSpDJo/aKHSKT5YSryIDci1yuPK2Y8y3I 5r+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690891485; x=1691496285; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=lUSZxUxJVRcnvJ4sobFgXrYil73npapr2l2ITiQG0aI=; b=Rou/NosTIsbzvvCpmhyKLaj7Prvb8hCSVudy+949GmF/8nlVUs0O+EEq8B5wWHUCDm 9x0Up5XzRz8QN8UYNM6BHgXVwM0kpyks7j4SKVu9aKf2/suWVMjbbdEvbs5oJBryK67m irRdrPXmo3MAjiCE72FwC7Hc6nEuIB/TER5XxCGTk4dCjqOFjKzzclBB6rOZi7gbkoj9 FgVv/ocGwpftdLQUzMfEqsGNwc7Xpq5D84BzlaloDznE1D213bjlDSDQqoofesHbSdDP 7X0OkR0aoSFS2cH4BypnuMnv8soTMnHjgrGOyLPejlhax5LTsYsDyMHL/8vyg6TwmfA4 jTPg== X-Gm-Message-State: ABy/qLYDjJexVV4zgft3Joxu00GnKkRTbGldapmxHo7r+tEvafu+ofpy hDG/QNd6gVuzsr7H47HnJHY= X-Google-Smtp-Source: APBJJlF+tW5ztsnU2aYScjsFUo6/gEbVHI011g23lXFi9h/0m5bqKGuO6i1p4n+q3KRRennzetzSgg== X-Received: by 2002:ac2:43b7:0:b0:4f9:5d2a:e0f5 with SMTP id t23-20020ac243b7000000b004f95d2ae0f5mr1926958lfl.19.1690891485429; Tue, 01 Aug 2023 05:04:45 -0700 (PDT) Received: from fedora ([213.255.186.46]) by smtp.gmail.com with ESMTPSA id q19-20020ac25293000000b004fe0ab60530sm2552455lfm.49.2023.08.01.05.04.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Aug 2023 05:04:44 -0700 (PDT) Date: Tue, 1 Aug 2023 15:04:40 +0300 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Marcin Wojtas , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 8/8] net-next: mvpp2: don't shadow error Message-ID: <8c5b976a4ef9ba38fc952e9cf61848baa3e9dfe7.1690890774.git.mazziesaccount@gmail.com> References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org Do not overwrite error from lower layers but return the actual error to user if obtaining an IRQ fails. Suggested-by: Andy Shevchenko Suggested-by: Jonathan Cameron Signed-off-by: Matti Vaittinen --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 2632ffe91ca5..2aba34a2ca76 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -5830,13 +5830,13 @@ static int mvpp2_multi_queue_vectors_init(struct mvpp2_port *port, } if (port_node) - v->irq = of_irq_get_byname(port_node, irqname); + ret = of_irq_get_byname(port_node, irqname); else - v->irq = fwnode_irq_get(port->fwnode, i); - if (v->irq < 0) { - ret = -EINVAL; + ret = fwnode_irq_get(port->fwnode, i); + if (ret < 0) goto err; - } + + v->irq = ret; netif_napi_add(port->dev, &v->napi, mvpp2_poll); }