From 4fcc999e98bc89190b051cc30932bd00d4ebe1f4 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 16 Apr 2013 09:28:27 +0000 Subject: [PATCH] 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 Signed-off-by: Fabio Estevam Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller --- drivers/net/can/mcp251x.c | 8 ++------ 1 file 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) 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, -- 2.20.1