From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lars-Peter Clausen Subject: Re: [PATCH 5/5] ks8851: Remove unneeded PM_OPS definitions Date: Tue, 16 Apr 2013 22:29:37 +0200 Message-ID: <516DB4B1.9050602@metafoo.de> References: <1366140511-3836-1-git-send-email-fabio.estevam@freescale.com> <1366140511-3836-5-git-send-email-fabio.estevam@freescale.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: davem@davemloft.net, netdev@vger.kernel.org, joe@perches.com To: Fabio Estevam Return-path: Received: from mailhost.informatik.uni-hamburg.de ([134.100.9.70]:33067 "EHLO mailhost.informatik.uni-hamburg.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753767Ab3DPU1K (ORCPT ); Tue, 16 Apr 2013 16:27:10 -0400 In-Reply-To: <1366140511-3836-5-git-send-email-fabio.estevam@freescale.com> Sender: netdev-owner@vger.kernel.org List-ID: On 04/16/2013 09:28 PM, Fabio Estevam wrote: > 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 yea, but now you have the dev_pm_ops struct, even if pm is disabled. - Lars > --- > drivers/net/ethernet/micrel/ks8851.c | 8 ++------ > 1 file 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,