aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-04-16 09:28:31 +0000
committerDavid S. Miller <davem@davemloft.net>2013-04-16 16:30:51 -0400
commit8ac2b3c0e270f9792edc15fb66808143eb48a53f (patch)
tree0dc17bfe24b293f3bd59f815abf89294892307f2
parentc132cf56f1527d4667b52bf64453155bcacbea8a (diff)
downloadkernel_goldelico_gta04-8ac2b3c0e270f9792edc15fb66808143eb48a53f.zip
kernel_goldelico_gta04-8ac2b3c0e270f9792edc15fb66808143eb48a53f.tar.gz
kernel_goldelico_gta04-8ac2b3c0e270f9792edc15fb66808143eb48a53f.tar.bz2
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 da64960..727b546a 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)
return 0;
}
+#endif
static SIMPLE_DEV_PM_OPS(ks8851_pm_ops, ks8851_suspend, ks8851_resume);
-#define KS8851_PM_OPS (&ks8851_pm_ops)
-
-#else
-#define KS8851_PM_OPS NULL
-#endif
static int ks8851_probe(struct spi_device *spi)
{
@@ -1536,7 +1532,7 @@ static struct spi_driver ks8851_driver = {
.driver = {
.name = "ks8851",
.owner = THIS_MODULE,
- .pm = KS8851_PM_OPS,
+ .pm = &ks8851_pm_ops,
},
.probe = ks8851_probe,
.remove = ks8851_remove,