Commit 733d4bbf authored by Leon Romanovsky's avatar Leon Romanovsky Committed by David S. Miller
Browse files

net: liquidio: simplify if expression



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: 8979f428 ("net: liquidio: release resources when liquidio driver open failed")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Reviewed-by: default avatarSaeed Mahameed <saeed@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 11b64a46
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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) {