diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-04-16 05:28:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-16 16:30:50 -0400 |
commit | 4fcc999e98bc89190b051cc30932bd00d4ebe1f4 (patch) | |
tree | 3bc44ba22836e732975daad15d2cf226d299f350 | |
parent | 61f47132dcba1eacf8fd8e64488d0b6d4bcbe4a0 (diff) |
can: mcp251x: Remove unneeded PM_OPS definitions
SIMPLE_DEV_PM_OPS macro can handle !CONFIG_PM_SLEEP case nicely, so there is no
need to define PM_OPS for both CONFIG_PM_SLEEP and !CONFIG_PM_SLEEP cases.
Remove the unneeded definitions.
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/can/mcp251x.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c index 3444e9ee4a80..55033dd57afb 100644 --- a/drivers/net/can/mcp251x.c +++ b/drivers/net/can/mcp251x.c | |||
@@ -1194,14 +1194,10 @@ static int mcp251x_can_resume(struct device *dev) | |||
1194 | enable_irq(spi->irq); | 1194 | enable_irq(spi->irq); |
1195 | return 0; | 1195 | return 0; |
1196 | } | 1196 | } |
1197 | #endif | ||
1197 | 1198 | ||
1198 | static SIMPLE_DEV_PM_OPS(mcp251x_can_pm_ops, mcp251x_can_suspend, | 1199 | static SIMPLE_DEV_PM_OPS(mcp251x_can_pm_ops, mcp251x_can_suspend, |
1199 | mcp251x_can_resume); | 1200 | mcp251x_can_resume); |
1200 | #define MCP251X_PM_OPS (&mcp251x_can_pm_ops) | ||
1201 | |||
1202 | #else | ||
1203 | #define MCP251X_PM_OPS NULL | ||
1204 | #endif | ||
1205 | 1201 | ||
1206 | static const struct spi_device_id mcp251x_id_table[] = { | 1202 | static const struct spi_device_id mcp251x_id_table[] = { |
1207 | { "mcp2510", CAN_MCP251X_MCP2510 }, | 1203 | { "mcp2510", CAN_MCP251X_MCP2510 }, |
@@ -1215,7 +1211,7 @@ static struct spi_driver mcp251x_can_driver = { | |||
1215 | .driver = { | 1211 | .driver = { |
1216 | .name = DEVICE_NAME, | 1212 | .name = DEVICE_NAME, |
1217 | .owner = THIS_MODULE, | 1213 | .owner = THIS_MODULE, |
1218 | .pm = MCP251X_PM_OPS, | 1214 | .pm = &mcp251x_can_pm_ops, |
1219 | }, | 1215 | }, |
1220 | 1216 | ||
1221 | .id_table = mcp251x_id_table, | 1217 | .id_table = mcp251x_id_table, |