Commit 47f96054 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Paolo Abeni
Browse files

net: ethernet: ti: am65-cpsw: prevent WARN_ON upon module removal 



In am65_cpsw_nuss_remove(), move the call to am65_cpsw_unregister_devlink()
after am65_cpsw_nuss_cleanup_ndev() to avoid triggering the
WARN_ON(devlink_port->type != DEVLINK_PORT_TYPE_NOTSET) in
devl_port_unregister(). Makes it coherent with usage in
m65_cpsw_nuss_register_ndevs()'s cleanup path.

Fixes: 58356eb3 ("net: ti: am65-cpsw-nuss: Add devlink support")
Signed-off-by: default avatarNicolas Pitre <npitre@baylibre.com>
Reviewed-by: default avatarRoger Quadros <rogerq@kernel.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 3dc6e998

drivers/net/ethernet/ti/am65-cpsw-nuss.c

+1 −1
Original line number Diff line number Diff line
@@ -3652,13 +3652,13 @@ static void am65_cpsw_nuss_remove(struct platform_device *pdev) 
		return;

	}



	am65_cpsw_unregister_devlink(common);

	am65_cpsw_unregister_notifiers(common);



	/* must unregister ndevs here because DD release_driver routine calls

	 * dma_deconfigure(dev) before devres_release_all(dev)

	 */

	am65_cpsw_nuss_cleanup_ndev(common);

	am65_cpsw_unregister_devlink(common);

	am65_cpsw_nuss_phylink_cleanup(common);

	am65_cpts_release(common->cpts);

	am65_cpsw_disable_serdes_phy(common);