tg3: Remove unneeded PM_OPS definitions
authorFabio Estevam <fabio.estevam@freescale.com>
Tue, 16 Apr 2013 09:28:29 +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: Nithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/tg3.c

index ce98572..45719dd 100644 (file)
@@ -17533,15 +17533,9 @@ out:
 
        return err;
 }
+#endif /* CONFIG_PM_SLEEP */
 
 static SIMPLE_DEV_PM_OPS(tg3_pm_ops, tg3_suspend, tg3_resume);
-#define TG3_PM_OPS (&tg3_pm_ops)
-
-#else
-
-#define TG3_PM_OPS NULL
-
-#endif /* CONFIG_PM_SLEEP */
 
 /**
  * tg3_io_error_detected - called when PCI error is detected
@@ -17689,7 +17683,7 @@ static struct pci_driver tg3_driver = {
        .probe          = tg3_init_one,
        .remove         = tg3_remove_one,
        .err_handler    = &tg3_err_handler,
-       .driver.pm      = TG3_PM_OPS,
+       .driver.pm      = &tg3_pm_ops,
 };
 
 static int __init tg3_init(void)