]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
atl1: Remove unneeded PM_OPS definitions
authorFabio Estevam <fabio.estevam@freescale.com>
Tue, 16 Apr 2013 09:28:28 +0000 (09:28 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Apr 2013 20:30:51 +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: Jay Cliburn <jcliburn@gmail.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/atheros/atlx/atl1.c

index 9948fee28ae5c9711dbc23f5c7fcb7b278db8342..9843c7059b6cbe4a959d78dbd84e8c43a77a2f9c 100644 (file)
@@ -2876,16 +2876,9 @@ static int atl1_resume(struct device *dev)
 
        return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(atl1_pm_ops, atl1_suspend, atl1_resume);
-#define ATL1_PM_OPS    (&atl1_pm_ops)
-
-#else
-
-static int atl1_suspend(struct device *dev) { return 0; }
-
-#define ATL1_PM_OPS    NULL
-#endif
 
 static void atl1_shutdown(struct pci_dev *pdev)
 {
@@ -3147,7 +3140,7 @@ static struct pci_driver atl1_driver = {
        .probe = atl1_probe,
        .remove = atl1_remove,
        .shutdown = atl1_shutdown,
-       .driver.pm = ATL1_PM_OPS,
+       .driver.pm = &atl1_pm_ops,
 };
 
 /**