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

Commit 87cad5c3 authored by Eric Benard's avatar Eric Benard Committed by David S. Miller
Browse files

net/fec: clean suspend/resume 



Commit 59d4289b converted fec to dev_pm_ops but
didn't update the suspend/resume functions thus leading to the following warning :
"initialization from incompatible pointer type" when CONFIG_PM is set.

This patch also fixe a few indentation and style around CONFIG_PM area.

Signed-off-by: default avatarEric Bénard <eric@eukrea.com>
Cc: netdev@vger.kernel.org
Cc: davem@davemloft.net
Cc: amit.kucheria@canonical.com
Cc: s.hauer@pengutronix.de
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d05f6cf0

drivers/net/fec.c

+12 −18
Original line number Diff line number Diff line
@@ -1360,11 +1360,10 @@ fec_drv_remove(struct platform_device *pdev) 
}



#ifdef CONFIG_PM



static int

fec_suspend(struct platform_device *dev, pm_message_t state)

fec_suspend(struct device *dev)

{

	struct net_device *ndev = platform_get_drvdata(dev);

	struct net_device *ndev = dev_get_drvdata(dev);

	struct fec_enet_private *fep;



	if (ndev) {
@@ -1377,9 +1376,9 @@ fec_suspend(struct platform_device *dev, pm_message_t state) 
}



static int

fec_resume(struct platform_device *dev)

fec_resume(struct device *dev)

{

	struct net_device *ndev = platform_get_drvdata(dev);

	struct net_device *ndev = dev_get_drvdata(dev);

	struct fec_enet_private *fep;



	if (ndev) {
@@ -1399,20 +1398,15 @@ static const struct dev_pm_ops fec_pm_ops = { 
	.poweroff	= fec_suspend,

	.restore	= fec_resume,

};



#define FEC_PM_OPS (&fec_pm_ops)



#else /* !CONFIG_PM */



#define FEC_PM_OPS NULL



#endif /* !CONFIG_PM */

#endif



static struct platform_driver fec_driver = {

	.driver	= {

		.name	= "fec",

		.owner	= THIS_MODULE,

		.pm		 = FEC_PM_OPS,

#ifdef CONFIG_PM

		.pm	= &fec_pm_ops,

#endif

	},

	.probe	= fec_probe,

	.remove	= __devexit_p(fec_drv_remove),