diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2014-03-05 18:10:44 (GMT) |
|---|---|---|
| committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:38:26 (GMT) |
| commit | 068b3b6c3019302572098fdb22a8dd2d69c8825b (patch) | |
| tree | 933ae5a57a938ed9d528cfa23106258af6a019bf /drivers/net/can | |
| parent | 748c627c4efdb58ff657da7e3932e2e90e6d7688 (diff) | |
| download | linux-fsl-qoriq-068b3b6c3019302572098fdb22a8dd2d69c8825b.tar.xz | |
can: flexcan: Remove #ifdef CONFIG_PM_SLEEP
This patch removes #ifdef CONFIG_PM_SLEEP to improve compile coverage.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
Cherry-picked from linux-next: 08c6d35154069becb01243176fb72b3bc60ff3cb
Change-Id: I062083cf2a38d7b3dfa2c9a3329c843ed6c91cf8
Reviewed-on: http://git.am.freescale.net:8181/21839
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Zhengxiong Jin <Jason.Jin@freescale.com>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/flexcan.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 1444c1a..8553cb9 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -1198,8 +1198,7 @@ static int flexcan_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_SLEEP -static int flexcan_suspend(struct device *device) +static int __maybe_unused flexcan_suspend(struct device *device) { struct net_device *dev = dev_get_drvdata(device); struct flexcan_priv *priv = netdev_priv(dev); @@ -1218,7 +1217,7 @@ static int flexcan_suspend(struct device *device) return 0; } -static int flexcan_resume(struct device *device) +static int __maybe_unused flexcan_resume(struct device *device) { struct net_device *dev = dev_get_drvdata(device); struct flexcan_priv *priv = netdev_priv(dev); @@ -1230,7 +1229,6 @@ static int flexcan_resume(struct device *device) } return flexcan_chip_enable(priv); } -#endif /* CONFIG_PM_SLEEP */ static SIMPLE_DEV_PM_OPS(flexcan_pm_ops, flexcan_suspend, flexcan_resume); |