evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

can: mcp251x: Remove unneeded PM_OPS definitions

Browse source 
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>
This commit is contained in:
Fabio Estevam 2013-04-16 09:28:27 +00:00 • committed by David S. Miller
parent 61f47132dc
commit 4fcc999e98
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/can/mcp251x.c
View file

@ -1194,14 +1194,10 @@ static int mcp251x_can_resume(struct device *dev)
enable_irq(spi->irq); enable_irq(spi->irq);
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(mcp251x_can_pm_ops, mcp251x_can_suspend, static SIMPLE_DEV_PM_OPS(mcp251x_can_pm_ops, mcp251x_can_suspend,
mcp251x_can_resume); 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[] = { static const struct spi_device_id mcp251x_id_table[] = {
{ "mcp2510", CAN_MCP251X_MCP2510 }, { "mcp2510", CAN_MCP251X_MCP2510 },
@ -1215,7 +1211,7 @@ static struct spi_driver mcp251x_can_driver = {
.driver = { .driver = {
.name = DEVICE_NAME, .name = DEVICE_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = MCP251X_PM_OPS, .pm = &mcp251x_can_pm_ops,
}, },
.id_table = mcp251x_id_table, .id_table = mcp251x_id_table,