Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fcc999e authored by Fabio Estevam's avatar Fabio Estevam Committed by David S. Miller
Browse files

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: default avatarFabio Estevam <fabio.estevam@freescale.com>
Acked-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61f47132

drivers/net/can/mcp251x.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -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,