From: Yongxin Liu <yongxin.liu@windriver.com>
To: <bgolaszewski@baylibre.com>, <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH] Revert "net: ethernet: ixgbe: check the return value of ixgbe_mii_bus_init()"
Date: Fri, 25 Sep 2020 10:42:47 +0800 [thread overview]
Message-ID: <20200925024247.993-1-yongxin.liu@windriver.com> (raw)
This reverts commit 09ef193fef7efb0175a04634853862d717adbb95.
For C3000 family of SoCs, they have four ixgbe devices sharing a single MDIO bus.
ixgbe_mii_bus_init() returns -ENODEV for other three devices. The propagation
of the error code makes other three ixgbe devices unregistered.
Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 2f8a4cfc5fa1..5e5223becf86 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -11031,14 +11031,10 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
IXGBE_LINK_SPEED_10GB_FULL | IXGBE_LINK_SPEED_1GB_FULL,
true);
- err = ixgbe_mii_bus_init(hw);
- if (err)
- goto err_netdev;
+ ixgbe_mii_bus_init(hw);
return 0;
-err_netdev:
- unregister_netdev(netdev);
err_register:
ixgbe_release_hw_control(adapter);
ixgbe_clear_interrupt_scheme(adapter);
--
2.14.4
next reply other threads:[~2020-09-25 3:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-25 2:42 Yongxin Liu [this message]
2020-09-25 8:14 ` [PATCH] Revert "net: ethernet: ixgbe: check the return value of ixgbe_mii_bus_init()" Bartosz Golaszewski
2020-09-25 8:51 ` Liu, Yongxin
2020-09-25 9:43 ` Bartosz Golaszewski
2020-09-26 23:27 ` Liu, Yongxin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200925024247.993-1-yongxin.liu@windriver.com \
--to=yongxin.liu@windriver.com \
--cc=bgolaszewski@baylibre.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).