]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
xgmac: Remove unneeded PM_OPS definitions
authorFabio Estevam <fabio.estevam@freescale.com>
Tue, 16 Apr 2013 09:28:30 +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.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/calxeda/xgmac.c

index b0ebc9f6d55e9844e1ebe9367e9340681cba2a72..791e5ff305d8a036600bc4c76ce94a0b4b1ad80a 100644 (file)
@@ -1886,12 +1886,9 @@ static int xgmac_resume(struct device *dev)
 
        return 0;
 }
+#endif /* CONFIG_PM_SLEEP */
 
 static SIMPLE_DEV_PM_OPS(xgmac_pm_ops, xgmac_suspend, xgmac_resume);
-#define XGMAC_PM_OPS (&xgmac_pm_ops)
-#else
-#define XGMAC_PM_OPS NULL
-#endif /* CONFIG_PM_SLEEP */
 
 static const struct of_device_id xgmac_of_match[] = {
        { .compatible = "calxeda,hb-xgmac", },
@@ -1906,7 +1903,7 @@ static struct platform_driver xgmac_driver = {
        },
        .probe = xgmac_probe,
        .remove = xgmac_remove,
-       .driver.pm = XGMAC_PM_OPS,
+       .driver.pm = &xgmac_pm_ops,
 };
 
 module_platform_driver(xgmac_driver);