2022-04-05 03:42:25

by Xiaomeng Tong

Subject: [PATCH] qed: remove an unneed NULL check on list iterator

The define for_each_pci_dev(d) is:
while ((d = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, d)) != NULL)

Thus, the list iterator 'd' is always non-NULL so it doesn't need to
be checked. So just remove the unnecessary NULL check. Also remove the
unnecessary initializer because the list iterator is always initialized.

Signed-off-by: Xiaomeng Tong <[email protected]>
---
drivers/net/ethernet/qlogic/qed/qed_nvmetcp_ip_services.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qed/qed_nvmetcp_ip_services.c b/drivers/net/ethernet/qlogic/qed/qed_nvmetcp_ip_services.c
index 96a2077fd315..37af8395f1bd 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_nvmetcp_ip_services.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_nvmetcp_ip_services.c
@@ -161,11 +161,11 @@ EXPORT_SYMBOL(qed_vlan_get_ndev);

struct pci_dev *qed_validate_ndev(struct net_device *ndev)
{
- struct pci_dev *pdev = NULL;
+ struct pci_dev *pdev;
struct net_device *upper;

for_each_pci_dev(pdev) {
- if (pdev && pdev->driver &&
+ if (pdev->driver &&
!strcmp(pdev->driver->name, "qede")) {
upper = pci_get_drvdata(pdev);
if (upper->ifindex == ndev->ifindex)
--
2.17.1

2022-04-06 15:38:18

by Jakub Kicinski

Subject: Re: [PATCH] qed: remove an unneed NULL check on list iterator

On Tue, 5 Apr 2022 08:22:56 +0800 Xiaomeng Tong wrote:
> struct pci_dev *qed_validate_ndev(struct net_device *ndev)
> {
> - struct pci_dev *pdev = NULL;
> + struct pci_dev *pdev;
> struct net_device *upper;

Please keep the longest-to-shortest ordering of variable declaration
lines.

2022-04-07 20:58:34

by Xiaomeng Tong

Subject: Re: [PATCH] qed: remove an unneed NULL check on list iterator

On Tue, 5 Apr 2022 18:26:41 -0700, Jakub Kicinski wrote:
> On Tue, 5 Apr 2022 08:22:56 +0800 Xiaomeng Tong wrote:
> > struct pci_dev *qed_validate_ndev(struct net_device *ndev)
> > {
> > - struct pci_dev *pdev = NULL;
> > + struct pci_dev *pdev;
> > struct net_device *upper;
>
> Please keep the longest-to-shortest ordering of variable declaration
> lines.

I have fix it in v2 patch [1], as you suggested. Please check it.
Thank you very much.

[1] https://lore.kernel.org/lkml/[email protected]/
--
Xiaomeng Tong