From: Shannon Nelson <shannon.nelson@amd.com>
To: <netdev@vger.kernel.org>, <davem@davemloft.net>, <kuba@kernel.org>
Cc: <brett.creeley@amd.com>, <drivers@pensando.io>,
Shannon Nelson <shannon.nelson@amd.com>
Subject: [PATCH net-next 1/5] ionic: remove dead device fail path
Date: Tue, 11 Jul 2023 17:20:21 -0700 [thread overview]
Message-ID: <20230712002025.24444-2-shannon.nelson@amd.com> (raw)
In-Reply-To: <20230712002025.24444-1-shannon.nelson@amd.com>
Remove the probe error path code that leaves the driver bound
to the device, but with essentially a dead device. This was
useful maybe twice early in the driver's life and no longer
makes sense to keep.
Note: This patch is cherry-picked from commit 3a7af34fb6e
because the following patchset is dependent on this
change. This patch can be dropped from this series
once net-next is updated
Fixes: 30a1e6d0f8e2 ("ionic: keep ionic dev on lif init fail")
Signed-off-by: Shannon Nelson <shannon.nelson@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
index b8678da1cce5..ab7d217b98b3 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
@@ -353,12 +353,6 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
ionic_reset(ionic);
err_out_teardown:
ionic_dev_teardown(ionic);
- pci_clear_master(pdev);
- /* Don't fail the probe for these errors, keep
- * the hw interface around for inspection
- */
- return 0;
-
err_out_unmap_bars:
ionic_unmap_bars(ionic);
err_out_pci_release_regions:
--
2.17.1
next prev parent reply other threads:[~2023-07-12 0:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-12 0:20 [PATCH net-next 0/5] ionic: add FLR support Shannon Nelson
2023-07-12 0:20 ` Shannon Nelson [this message]
2023-07-12 0:20 ` [PATCH net-next 2/5] ionic: extract common bits from ionic_remove Shannon Nelson
2023-07-12 0:20 ` [PATCH net-next 3/5] ionic: extract common bits from ionic_probe Shannon Nelson
2023-07-12 0:20 ` [PATCH net-next 4/5] ionic: pull out common bits from fw_up Shannon Nelson
2023-07-12 0:20 ` [PATCH net-next 5/5] ionic: add FLR recovery support Shannon Nelson
2023-07-12 9:01 ` Ido Schimmel
2023-07-12 17:02 ` Shannon Nelson
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=20230712002025.24444-2-shannon.nelson@amd.com \
--to=shannon.nelson@amd.com \
--cc=brett.creeley@amd.com \
--cc=davem@davemloft.net \
--cc=drivers@pensando.io \
--cc=kuba@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).