summaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-04-16 09:28:27 +0000
committerDavid S. Miller <davem@davemloft.net>2013-04-16 16:30:50 -0400
commit4fcc999e98bc89190b051cc30932bd00d4ebe1f4 (patch)
tree3bc44ba22836e732975daad15d2cf226d299f350 /drivers/net/can
parent61f47132dcba1eacf8fd8e64488d0b6d4bcbe4a0 (diff)
downloadop-kernel-dev-4fcc999e98bc89190b051cc30932bd00d4ebe1f4.zip
op-kernel-dev-4fcc999e98bc89190b051cc30932bd00d4ebe1f4.tar.gz
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>
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/mcp251x.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index 3444e9e..55033dd5 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)
enable_irq(spi->irq);
return 0;
}
+#endif
static SIMPLE_DEV_PM_OPS(mcp251x_can_pm_ops, mcp251x_can_suspend,
mcp251x_can_resume);
-#define MCP251X_PM_OPS (&mcp251x_can_pm_ops)
-
-#else
-#define MCP251X_PM_OPS NULL
-#endif
static const struct spi_device_id mcp251x_id_table[] = {
{ "mcp2510", CAN_MCP251X_MCP2510 },
@@ -1215,7 +1211,7 @@ static struct spi_driver mcp251x_can_driver = {
.driver = {
.name = DEVICE_NAME,
.owner = THIS_MODULE,
- .pm = MCP251X_PM_OPS,
+ .pm = &mcp251x_can_pm_ops,
},
.id_table = mcp251x_id_table,
OpenPOWER on IntegriCloud