* [PATCH] e1000: Remove redundant else after return
@ 2026-06-16 21:00 Lovekesh Solanki
2026-06-16 21:51 ` Andrew Lunn
2026-06-17 20:02 ` kernel test robot
0 siblings, 2 replies; 5+ messages in thread
From: Lovekesh Solanki @ 2026-06-16 21:00 UTC (permalink / raw)
To: anthony.l.nguyen
Cc: przemyslaw.kitszel, andrew+netdev, davem, edumazet, kuba, pabeni,
netdev, Lovekesh Solanki
The else branch is needless because the preceding branch
unconditionally returns -ENOMEM
Reduce nesting by removing unnecessary else
Signed-off-by: Lovekesh Solanki <lovekeshsolanki00@gmail.com>
---
drivers/net/ethernet/intel/e1000/e1000_main.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 9b09eb144b81..3d97e952c916 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -1546,11 +1546,10 @@ static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
"for the transmit descriptor ring\n");
vfree(txdr->buffer_info);
return -ENOMEM;
- } else {
+ }
/* Free old allocation, new allocation was successful */
dma_free_coherent(&pdev->dev, txdr->size, olddesc,
olddma);
- }
}
memset(txdr->desc, 0, txdr->size);
--
2.54.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] e1000: Remove redundant else after return
2026-06-16 21:00 [PATCH] e1000: Remove redundant else after return Lovekesh Solanki
@ 2026-06-16 21:51 ` Andrew Lunn
2026-06-17 7:58 ` Lovekesh Solanki
2026-06-17 20:02 ` kernel test robot
1 sibling, 1 reply; 5+ messages in thread
From: Andrew Lunn @ 2026-06-16 21:51 UTC (permalink / raw)
To: Lovekesh Solanki
Cc: anthony.l.nguyen, przemyslaw.kitszel, andrew+netdev, davem,
edumazet, kuba, pabeni, netdev
On Wed, Jun 17, 2026 at 02:30:08AM +0530, Lovekesh Solanki wrote:
> The else branch is needless because the preceding branch
> unconditionally returns -ENOMEM
>
> Reduce nesting by removing unnecessary else
>
> Signed-off-by: Lovekesh Solanki <lovekeshsolanki00@gmail.com>
> ---
> drivers/net/ethernet/intel/e1000/e1000_main.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
> index 9b09eb144b81..3d97e952c916 100644
> --- a/drivers/net/ethernet/intel/e1000/e1000_main.c
> +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
> @@ -1546,11 +1546,10 @@ static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
> "for the transmit descriptor ring\n");
> vfree(txdr->buffer_info);
> return -ENOMEM;
> - } else {
> + }
> /* Free old allocation, new allocation was successful */
> dma_free_coherent(&pdev->dev, txdr->size, olddesc,
> olddma);
> - }
Hi Lovekesh
Please review this patch yourself and tell us what is wrong with it.
Also, please read
https://www.kernel.org/doc/html/latest/process/maintainer-netdev.html
Andrew
---
pw-bot: cr
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] e1000: Remove redundant else after return
2026-06-16 21:51 ` Andrew Lunn
@ 2026-06-17 7:58 ` Lovekesh Solanki
2026-06-17 9:36 ` Andrew Lunn
0 siblings, 1 reply; 5+ messages in thread
From: Lovekesh Solanki @ 2026-06-17 7:58 UTC (permalink / raw)
To: andrew
Cc: andrew+netdev, anthony.l.nguyen, davem, edumazet, kuba,
lovekeshsolanki00, netdev, pabeni, przemyslaw.kitszel
Hi Andrew,
I read the documentation you linked and understand simple standalone
cleanups are discouraged.
Thanks for the review, I will drop this patch.
Regards,
Lovekesh
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] e1000: Remove redundant else after return
2026-06-17 7:58 ` Lovekesh Solanki
@ 2026-06-17 9:36 ` Andrew Lunn
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Lunn @ 2026-06-17 9:36 UTC (permalink / raw)
To: Lovekesh Solanki
Cc: andrew+netdev, anthony.l.nguyen, davem, edumazet, kuba, netdev,
pabeni, przemyslaw.kitszel
On Wed, Jun 17, 2026 at 01:28:55PM +0530, Lovekesh Solanki wrote:
> Hi Andrew,
>
> I read the documentation you linked and understand simple standalone
> cleanups are discouraged.
You also said in the commit message it reduced the indentation level,
but you did not actually reduce the indentation!
Andrew
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] e1000: Remove redundant else after return
2026-06-16 21:00 [PATCH] e1000: Remove redundant else after return Lovekesh Solanki
2026-06-16 21:51 ` Andrew Lunn
@ 2026-06-17 20:02 ` kernel test robot
1 sibling, 0 replies; 5+ messages in thread
From: kernel test robot @ 2026-06-17 20:02 UTC (permalink / raw)
To: Lovekesh Solanki, anthony.l.nguyen
Cc: oe-kbuild-all, przemyslaw.kitszel, andrew+netdev, davem, edumazet,
kuba, pabeni, netdev, Lovekesh Solanki
Hi Lovekesh,
kernel test robot noticed the following build warnings:
[auto build test WARNING on tnguy-next-queue/dev-queue]
[also build test WARNING on tnguy-net-queue/dev-queue linus/master v7.1 next-20260616]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Lovekesh-Solanki/e1000-Remove-redundant-else-after-return/20260617-051633
base: https://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue.git dev-queue
patch link: https://lore.kernel.org/r/20260616210008.109635-1-lovekeshsolanki00%40gmail.com
patch subject: [PATCH] e1000: Remove redundant else after return
config: powerpc-randconfig-r073-20260617 (https://download.01.org/0day-ci/archive/20260618/202606180301.nRhk5lMR-lkp@intel.com/config)
compiler: clang version 23.0.0git (https://github.com/llvm/llvm-project e19d1f51a2c80b63cd8ca95bcc757b7077112808)
smatch: v0.5.0-9185-gbcc58b9c
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202606180301.nRhk5lMR-lkp@intel.com/
New smatch warnings:
drivers/net/ethernet/intel/e1000/e1000_main.c:1551 e1000_setup_tx_resources() warn: inconsistent indenting
Old smatch warnings:
arch/powerpc/include/asm/checksum.h:94 csum_tcpudp_nofold() warn: inconsistent indenting
vim +1551 drivers/net/ethernet/intel/e1000/e1000_main.c
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1491
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1492 /**
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1493 * e1000_setup_tx_resources - allocate Tx resources (Descriptors)
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1494 * @adapter: board private structure
581d708eb47ccc drivers/net/e1000/e1000_main.c Mallikarjuna R Chilakala 2005-10-04 1495 * @txdr: tx descriptor ring (for a specific queue) to setup
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1496 *
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1497 * Return 0 on success, negative on failure
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1498 **/
6479884509e6cd drivers/net/e1000/e1000_main.c Joe Perches 2008-07-11 1499 static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
581d708eb47ccc drivers/net/e1000/e1000_main.c Mallikarjuna R Chilakala 2005-10-04 1500 struct e1000_tx_ring *txdr)
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1501 {
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1502 struct pci_dev *pdev = adapter->pdev;
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1503 int size;
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1504
580f321d8498f1 drivers/net/ethernet/intel/e1000/e1000_main.c Florian Westphal 2014-09-03 1505 size = sizeof(struct e1000_tx_buffer) * txdr->count;
89bf67f1f080c9 drivers/net/e1000/e1000_main.c Eric Dumazet 2010-11-22 1506 txdr->buffer_info = vzalloc(size);
14f8dc49532f76 drivers/net/ethernet/intel/e1000/e1000_main.c Joe Perches 2013-02-07 1507 if (!txdr->buffer_info)
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1508 return -ENOMEM;
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1509
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1510 /* round up to nearest 4K */
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1511
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1512 txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
9099cfb9170f35 drivers/net/e1000/e1000_main.c Milind Arun Choudhary 2007-04-27 1513 txdr->size = ALIGN(txdr->size, 4096);
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1514
b16f53bef9be0a drivers/net/e1000/e1000_main.c Nick Nunley 2010-04-27 1515 txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
b16f53bef9be0a drivers/net/e1000/e1000_main.c Nick Nunley 2010-04-27 1516 GFP_KERNEL);
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1517 if (!txdr->desc) {
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1518 setup_tx_desc_die:
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1519 vfree(txdr->buffer_info);
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1520 return -ENOMEM;
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1521 }
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1522
2648345fcbadfa drivers/net/e1000/e1000_main.c Malli Chilakala 2005-04-28 1523 /* Fix for errata 23, can't cross 64kB boundary */
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1524 if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) {
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1525 void *olddesc = txdr->desc;
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1526 dma_addr_t olddma = txdr->dma;
feb8f47809fcc6 drivers/net/e1000/e1000_main.c Emil Tantilov 2010-07-26 1527 e_err(tx_err, "txdr align check failed: %u bytes at %p\n",
675ad47375c76a drivers/net/e1000/e1000_main.c Emil Tantilov 2010-04-27 1528 txdr->size, txdr->desc);
2648345fcbadfa drivers/net/e1000/e1000_main.c Malli Chilakala 2005-04-28 1529 /* Try again, without freeing the previous */
b16f53bef9be0a drivers/net/e1000/e1000_main.c Nick Nunley 2010-04-27 1530 txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size,
b16f53bef9be0a drivers/net/e1000/e1000_main.c Nick Nunley 2010-04-27 1531 &txdr->dma, GFP_KERNEL);
2648345fcbadfa drivers/net/e1000/e1000_main.c Malli Chilakala 2005-04-28 1532 /* Failed allocation, critical failure */
96838a40f02950 drivers/net/e1000/e1000_main.c Jesse Brandeburg 2006-01-18 1533 if (!txdr->desc) {
b16f53bef9be0a drivers/net/e1000/e1000_main.c Nick Nunley 2010-04-27 1534 dma_free_coherent(&pdev->dev, txdr->size, olddesc,
b16f53bef9be0a drivers/net/e1000/e1000_main.c Nick Nunley 2010-04-27 1535 olddma);
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1536 goto setup_tx_desc_die;
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1537 }
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1538
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1539 if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) {
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1540 /* give up */
b16f53bef9be0a drivers/net/e1000/e1000_main.c Nick Nunley 2010-04-27 1541 dma_free_coherent(&pdev->dev, txdr->size, txdr->desc,
2648345fcbadfa drivers/net/e1000/e1000_main.c Malli Chilakala 2005-04-28 1542 txdr->dma);
b16f53bef9be0a drivers/net/e1000/e1000_main.c Nick Nunley 2010-04-27 1543 dma_free_coherent(&pdev->dev, txdr->size, olddesc,
b16f53bef9be0a drivers/net/e1000/e1000_main.c Nick Nunley 2010-04-27 1544 olddma);
feb8f47809fcc6 drivers/net/e1000/e1000_main.c Emil Tantilov 2010-07-26 1545 e_err(probe, "Unable to allocate aligned memory "
2648345fcbadfa drivers/net/e1000/e1000_main.c Malli Chilakala 2005-04-28 1546 "for the transmit descriptor ring\n");
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1547 vfree(txdr->buffer_info);
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1548 return -ENOMEM;
d66eba46397f54 drivers/net/ethernet/intel/e1000/e1000_main.c Lovekesh Solanki 2026-06-17 1549 }
2648345fcbadfa drivers/net/e1000/e1000_main.c Malli Chilakala 2005-04-28 1550 /* Free old allocation, new allocation was successful */
b16f53bef9be0a drivers/net/e1000/e1000_main.c Nick Nunley 2010-04-27 @1551 dma_free_coherent(&pdev->dev, txdr->size, olddesc,
b16f53bef9be0a drivers/net/e1000/e1000_main.c Nick Nunley 2010-04-27 1552 olddma);
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1553 }
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1554 memset(txdr->desc, 0, txdr->size);
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1555
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1556 txdr->next_to_use = 0;
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1557 txdr->next_to_clean = 0;
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1558
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1559 return 0;
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1560 }
^1da177e4c3f41 drivers/net/e1000/e1000_main.c Linus Torvalds 2005-04-16 1561
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-06-17 20:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-06-16 21:00 [PATCH] e1000: Remove redundant else after return Lovekesh Solanki
2026-06-16 21:51 ` Andrew Lunn
2026-06-17 7:58 ` Lovekesh Solanki
2026-06-17 9:36 ` Andrew Lunn
2026-06-17 20:02 ` kernel test robot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.