]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
can: mcp251x: Remove unneeded PM_OPS definitions
authorFabio Estevam <fabio.estevam@freescale.com>
Tue, 16 Apr 2013 09:28:27 +0000 (09:28 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Apr 2013 20:30:50 +0000 (16:30 -0400)
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>
drivers/net/can/mcp251x.c

index 3444e9ee4a8080c4d0c63c15c14e8e6fc0d3b4e4..55033dd57afb06bf34723949751af908c3946faf 100644 (file)
@@ -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,