| Message ID | 1366140511-3836-1-git-send-email-fabio.estevam@freescale.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 04/16/2013 09:28 PM, Fabio Estevam wrote: > 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> David, are you directly taking the whole series? If not, this patch will go through the linux-can tree. Marc
From: Marc Kleine-Budde <mkl@pengutronix.de> Date: Tue, 16 Apr 2013 21:42:13 +0200 > On 04/16/2013 09:28 PM, Fabio Estevam wrote: >> 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> > > David, are you directly taking the whole series? If not, this patch will > go through the linux-can tree. I intend on taking it all in one gulp, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
All 5 patches applied. Please submit multi-patch sets with an initial "[PATCH 0/5] ..." email so that you can explain the top-level purpose of the patch series and also so that I can reply to that one if I apply them all. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c index 18e4010..8cda23b 100644 --- a/drivers/net/can/mcp251x.c +++ b/drivers/net/can/mcp251x.c @@ -1200,14 +1200,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 }, @@ -1221,7 +1217,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,
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> --- drivers/net/can/mcp251x.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)