[PATCH net] net: liquidio: simplify if expression

[PATCH net] net: liquidio: simplify if expression

[Leon Romanovsky]

From: Leon Romanovsky <leonro@nvidia.com>

Fix the warning reported by kbuild:

cocci warnings: (new ones prefixed by >>)
>> drivers/net/ethernet/cavium/liquidio/lio_main.c:1797:54-56: WARNING !A || A && B is equivalent to !A || B
   drivers/net/ethernet/cavium/liquidio/lio_main.c:1827:54-56: WARNING !A || A && B is equivalent to !A || B

Fixes: 8979f428a4af ("net: liquidio: release resources when liquidio driver open failed")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
---
The fixed patch was in net, so sending the fix to net too.
---
 drivers/net/ethernet/cavium/liquidio/lio_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 75771825c3f9..98793b2ac2c7 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -1794,7 +1794,7 @@ static int liquidio_open(struct net_device *netdev)
 
 	ifstate_set(lio, LIO_IFSTATE_RUNNING);
 
-	if (!OCTEON_CN23XX_PF(oct) || (OCTEON_CN23XX_PF(oct) && !oct->msix_on)) {
+	if (!OCTEON_CN23XX_PF(oct) || !oct->msix_on) {
 		ret = setup_tx_poll_fn(netdev);
 		if (ret)
 			goto err_poll;
@@ -1824,7 +1824,7 @@ static int liquidio_open(struct net_device *netdev)
 	return 0;
 
 err_rx_ctrl:
-	if (!OCTEON_CN23XX_PF(oct) || (OCTEON_CN23XX_PF(oct) && !oct->msix_on))
+	if (!OCTEON_CN23XX_PF(oct) || !oct->msix_on)
 		cleanup_tx_poll_fn(netdev);
 err_poll:
 	if (lio->ptp_clock) {
-- 
2.38.1

Re: [PATCH net] net: liquidio: simplify if expression

[Saeed Mahameed]

On 15 Nov 19:34, Leon Romanovsky wrote:
>From: Leon Romanovsky <leonro@nvidia.com>
>
>Fix the warning reported by kbuild:
>
>cocci warnings: (new ones prefixed by >>)
>>> drivers/net/ethernet/cavium/liquidio/lio_main.c:1797:54-56: WARNING !A || A && B is equivalent to !A || B
>   drivers/net/ethernet/cavium/liquidio/lio_main.c:1827:54-56: WARNING !A || A && B is equivalent to !A || B
>
>Fixes: 8979f428a4af ("net: liquidio: release resources when liquidio driver open failed")
>Reported-by: kernel test robot <lkp@intel.com>
>Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
>---
>The fixed patch was in net, so sending the fix to net too.
>---

I don't follow the above note, but anyway:

Reviewed-by: Saeed Mahameed <saeed@kernel.org>

Re: [PATCH net] net: liquidio: simplify if expression

[Leon Romanovsky]

On Wed, Nov 16, 2022 at 03:01:13PM -0800, Saeed Mahameed wrote:
> On 15 Nov 19:34, Leon Romanovsky wrote:
> > From: Leon Romanovsky <leonro@nvidia.com>
> > 
> > Fix the warning reported by kbuild:
> > 
> > cocci warnings: (new ones prefixed by >>)
> > > > drivers/net/ethernet/cavium/liquidio/lio_main.c:1797:54-56: WARNING !A || A && B is equivalent to !A || B
> >   drivers/net/ethernet/cavium/liquidio/lio_main.c:1827:54-56: WARNING !A || A && B is equivalent to !A || B
> > 
> > Fixes: 8979f428a4af ("net: liquidio: release resources when liquidio driver open failed")
> > Reported-by: kernel test robot <lkp@intel.com>
> > Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
> > ---
> > The fixed patch was in net, so sending the fix to net too.
> > ---
> 
> I don't follow the above note, but anyway:

Patch 8979f428a4af ("net: liquidio: release resources when liquidio
driver open failed") was accepted to net tree.
https://lore.kernel.org/netdev/166842061503.15162.7865291005287723428.git-patchwork-notify@kernel.org/

> 
> Reviewed-by: Saeed Mahameed <saeed@kernel.org>
> 

Re: [PATCH net] net: liquidio: simplify if expression

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:

On Tue, 15 Nov 2022 19:34:39 +0200 you wrote:
> From: Leon Romanovsky <leonro@nvidia.com>
> 
> Fix the warning reported by kbuild:
> 
> cocci warnings: (new ones prefixed by >>)
> >> drivers/net/ethernet/cavium/liquidio/lio_main.c:1797:54-56: WARNING !A || A && B is equivalent to !A || B
>    drivers/net/ethernet/cavium/liquidio/lio_main.c:1827:54-56: WARNING !A || A && B is equivalent to !A || B
> 
> [...]

Here is the summary with links:
  - [net] net: liquidio: simplify if expression
    https://git.kernel.org/netdev/net/c/733d4bbf9514

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html