enetc: Remove the imdio bus on PF probe bailout (c6dd6488) · Commits · 戴 / test

enetc_imdio_remove() is missing from the enetc_pf_probe() bailout path. Not surprisingly because enetc_setup_serdes() is registering the imdio bus for internal purposes, and it's not obvious that enetc_imdio_remove() currently performs the teardown of enetc_setup_serdes(). To fix this, define enetc_teardown_serdes() to wrap enetc_imdio_remove() (improve code maintenance) and call it on bailout and remove paths. Fixes: ("net: enetc: Initialize SerDes for SGMII and USXGMII protocols") Signed-off-by:

Claudiu Manoil <claudiu.manoil@nxp.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ethernet/freescale/enetc/enetc_pf.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -966,6 +966,13 @@ static int enetc_configure_serdes(struct enetc_ndev_priv *priv)
		return 0;
		}

		static void enetc_teardown_serdes(struct enetc_ndev_priv *priv)
		{
		struct enetc_pf *pf = enetc_si_priv(priv->si);

		enetc_imdio_remove(pf);
		}

		static int enetc_pf_probe(struct pci_dev *pdev,
		const struct pci_device_id *ent)
		{
		@@ -1045,6 +1052,7 @@ static int enetc_pf_probe(struct pci_dev *pdev,
		return 0;

		err_reg_netdev:
		enetc_teardown_serdes(priv);
		enetc_free_msix(priv);
		err_alloc_msix:
		enetc_free_si_resources(priv);
		@@ -1071,7 +1079,7 @@ static void enetc_pf_remove(struct pci_dev *pdev)
		priv = netdev_priv(si->ndev);
		unregister_netdev(si->ndev);

		enetc_imdio_remove(pf);
		enetc_teardown_serdes(priv);
		enetc_mdio_remove(pf);
		enetc_of_put_phy(pf);

Admin message