mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 14:44:12 +00:00
Code Issues Releases Wiki Activity

net/fec: clean suspend/resume

Browse source 
Commit 59d4289b83 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: Eric 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: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Benard 2010-06-18 04:19:54 +00:00 committed by David S. Miller
parent d05f6cf01c
commit 87cad5c385
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/net/fec.c
View file

@ -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,23 +1398,18 @@ 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,
.name = "fec",
.owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &fec_pm_ops,
#endif
},
.probe = fec_probe,
.remove = __devexit_p(fec_drv_remove),
.probe = fec_probe,
.remove = __devexit_p(fec_drv_remove),
};
static int __init