aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-04-16 05:28:31 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-16 16:30:51 -0400
commit8ac2b3c0e270f9792edc15fb66808143eb48a53f (patch)
tree0dc17bfe24b293f3bd59f815abf89294892307f2
parentc132cf56f1527d4667b52bf64453155bcacbea8a (diff)
ks8851: Remove unneeded PM_OPS definitions
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: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/micrel/ks8851.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index da6496055a1b..727b546a9eb8 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -1391,13 +1391,9 @@ static int ks8851_resume(struct device *dev)
1391 1391
1392 return 0; 1392 return 0;
1393} 1393}
1394#endif
1394 1395
1395static SIMPLE_DEV_PM_OPS(ks8851_pm_ops, ks8851_suspend, ks8851_resume); 1396static SIMPLE_DEV_PM_OPS(ks8851_pm_ops, ks8851_suspend, ks8851_resume);
1396#define KS8851_PM_OPS (&ks8851_pm_ops)
1397
1398#else
1399#define KS8851_PM_OPS NULL
1400#endif
1401 1397
1402static int ks8851_probe(struct spi_device *spi) 1398static int ks8851_probe(struct spi_device *spi)
1403{ 1399{
@@ -1536,7 +1532,7 @@ static struct spi_driver ks8851_driver = {
1536 .driver = { 1532 .driver = {
1537 .name = "ks8851", 1533 .name = "ks8851",
1538 .owner = THIS_MODULE, 1534 .owner = THIS_MODULE,
1539 .pm = KS8851_PM_OPS, 1535 .pm = &ks8851_pm_ops,
1540 }, 1536 },
1541 .probe = ks8851_probe, 1537 .probe = ks8851_probe,
1542 .remove = ks8851_remove, 1538 .remove = ks8851_remove,