Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04e5216d authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

net/fec: no need to check for validity of ndev in suspend and resume 



dev_set_drvdata is called unconditionally in the probe function and so
it cannot be NULL.

Reported-by: default avatarLothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent b2b09ad6

drivers/net/fec.c

+12 −16
Original line number Diff line number Diff line
@@ -1492,16 +1492,14 @@ static int 
fec_suspend(struct device *dev)

{

	struct net_device *ndev = dev_get_drvdata(dev);

	struct fec_enet_private *fep;

	struct fec_enet_private *fep = netdev_priv(ndev);



	if (ndev) {

		fep = netdev_priv(ndev);

	if (netif_running(ndev)) {

		fec_stop(ndev);

		netif_device_detach(ndev);

	}

	clk_disable(fep->clk);

	}



	return 0;

}
@@ -1509,16 +1507,14 @@ static int 
fec_resume(struct device *dev)

{

	struct net_device *ndev = dev_get_drvdata(dev);

	struct fec_enet_private *fep;

	struct fec_enet_private *fep = netdev_priv(ndev);



	if (ndev) {

		fep = netdev_priv(ndev);

	clk_enable(fep->clk);

	if (netif_running(ndev)) {

		fec_restart(ndev, fep->full_duplex);

		netif_device_attach(ndev);

	}

	}



	return 0;

}