From: Fabio Estevam Date: Tue, 16 Apr 2013 09:28:31 +0000 (+0000) Subject: ks8851: Remove unneeded PM_OPS definitions X-Git-Tag: MMI-PSA29.97-13-9~14469^2~123 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8ac2b3c0e270f9792edc15fb66808143eb48a53f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Fabio Estevam Signed-off-by: David S. Miller --- 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) 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,