asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fec: Simplify the PM related hooks

Browse source 
Get rid of the CONFIG_PM_SLEEP ifdef by annotating the suspend/resume functions
with '__maybe_unused' in order to keep the code simpler and shorter.

While at it, declare the suspend/resume functions in a single line.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Fabio Estevam 2014-07-24 18:24:01 -03:00 committed by David S. Miller
parent e40f5c7234
commit dd66d38655
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/ethernet/freescale/fec_main.c
View file

@ -2696,9 +2696,7 @@ fec_drv_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused fec_suspend(struct device *dev)
static int
fec_suspend(struct device *dev)
{ {
struct net_device *ndev = dev_get_drvdata(dev); struct net_device *ndev = dev_get_drvdata(dev);
struct fec_enet_private *fep = netdev_priv(ndev); struct fec_enet_private *fep = netdev_priv(ndev);
@ -2723,8 +2721,7 @@ fec_suspend(struct device *dev)
return 0; return 0;
} }
static int static int __maybe_unused fec_resume(struct device *dev)
fec_resume(struct device *dev)
{ {
struct net_device *ndev = dev_get_drvdata(dev); struct net_device *ndev = dev_get_drvdata(dev);
struct fec_enet_private *fep = netdev_priv(ndev); struct fec_enet_private *fep = netdev_priv(ndev);
@ -2759,7 +2756,6 @@ failed_clk:
regulator_disable(fep->reg_phy); regulator_disable(fep->reg_phy);
return ret; return ret;
} }
#endif /* CONFIG_PM_SLEEP */
static SIMPLE_DEV_PM_OPS(fec_pm_ops, fec_suspend, fec_resume); static SIMPLE_DEV_PM_OPS(fec_pm_ops, fec_suspend, fec_resume);