diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2014-03-05 13:10:44 -0500 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2014-03-06 16:20:43 -0500 |
commit | 08c6d35154069becb01243176fb72b3bc60ff3cb (patch) | |
tree | 052de6915503984f559080226654318622ad8fe7 /drivers/net/can | |
parent | f16a42107377e892d6d4535bbfc46308b4a1cdea (diff) |
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>
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 61376abdab39..efa1bbc9a1ec 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c | |||
@@ -1201,8 +1201,7 @@ static int flexcan_remove(struct platform_device *pdev) | |||
1201 | return 0; | 1201 | return 0; |
1202 | } | 1202 | } |
1203 | 1203 | ||
1204 | #ifdef CONFIG_PM_SLEEP | 1204 | static int __maybe_unused flexcan_suspend(struct device *device) |
1205 | static int flexcan_suspend(struct device *device) | ||
1206 | { | 1205 | { |
1207 | struct net_device *dev = dev_get_drvdata(device); | 1206 | struct net_device *dev = dev_get_drvdata(device); |
1208 | struct flexcan_priv *priv = netdev_priv(dev); | 1207 | struct flexcan_priv *priv = netdev_priv(dev); |
@@ -1221,7 +1220,7 @@ static int flexcan_suspend(struct device *device) | |||
1221 | return 0; | 1220 | return 0; |
1222 | } | 1221 | } |
1223 | 1222 | ||
1224 | static int flexcan_resume(struct device *device) | 1223 | static int __maybe_unused flexcan_resume(struct device *device) |
1225 | { | 1224 | { |
1226 | struct net_device *dev = dev_get_drvdata(device); | 1225 | struct net_device *dev = dev_get_drvdata(device); |
1227 | struct flexcan_priv *priv = netdev_priv(dev); | 1226 | struct flexcan_priv *priv = netdev_priv(dev); |
@@ -1233,7 +1232,6 @@ static int flexcan_resume(struct device *device) | |||
1233 | } | 1232 | } |
1234 | return flexcan_chip_enable(priv); | 1233 | return flexcan_chip_enable(priv); |
1235 | } | 1234 | } |
1236 | #endif /* CONFIG_PM_SLEEP */ | ||
1237 | 1235 | ||
1238 | static SIMPLE_DEV_PM_OPS(flexcan_pm_ops, flexcan_suspend, flexcan_resume); | 1236 | static SIMPLE_DEV_PM_OPS(flexcan_pm_ops, flexcan_suspend, flexcan_resume); |
1239 | 1237 | ||