| Message ID | 20230713192936.45152-2-shannon.nelson@amd.com (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | 3a7af34fb6ecd9fbeb4454fc03c654b26fab5f5e |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ionic: add FLR support | expand |
On Thu, 13 Jul 2023 12:29:32 -0700 Shannon Nelson wrote: > 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 Doesn't work, I tested applying the series after merging the trees - git am doesn't skip this cleanly so our scripts get confused and end up making a real mess of the branches. Let's stick to the documented process. You'll have to repost without this patch.
On 7/13/23 7:57 PM, Jakub Kicinski wrote: > On Thu, 13 Jul 2023 12:29:32 -0700 Shannon Nelson wrote: >> 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 > > Doesn't work, I tested applying the series after merging the trees - > git am doesn't skip this cleanly so our scripts get confused and > end up making a real mess of the branches. Let's stick to the > documented process. You'll have to repost without this patch. > -- > pw-bot: cr Okay, thanks for trying. I'll have a chance to update things and repost after the weekend. Cheers, sln
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:
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(-)