Messages in this thread | | | Date | Tue, 15 Oct 2013 09:41:37 +0200 | From | Nicolas Ferre <> | Subject | Re: [PATCH RFC 1/5] net: macb: Migrate to dev_pm_ops |
| |
On 15/10/2013 01:58, Soren Brinkmann : > Migrate the suspend/resume functions to use the dev_pm_ops PM interface. > > Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> --- > drivers/net/ethernet/cadence/macb.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c > index 92578690f6de..389ccf1362d5 100644 > --- a/drivers/net/ethernet/cadence/macb.c > +++ b/drivers/net/ethernet/cadence/macb.c > @@ -1946,8 +1946,9 @@ static int __exit macb_remove(struct platform_device *pdev) > } > > #ifdef CONFIG_PM > -static int macb_suspend(struct platform_device *pdev, pm_message_t state) > +static int macb_suspend(struct device *dev) > { > + struct platform_device *pdev = to_platform_device(dev); > struct net_device *netdev = platform_get_drvdata(pdev); > struct macb *bp = netdev_priv(netdev); > > @@ -1960,8 +1961,9 @@ static int macb_suspend(struct platform_device *pdev, pm_message_t state) > return 0; > } > > -static int macb_resume(struct platform_device *pdev) > +static int macb_resume(struct device *dev) > { > + struct platform_device *pdev = to_platform_device(dev); > struct net_device *netdev = platform_get_drvdata(pdev); > struct macb *bp = netdev_priv(netdev); > > @@ -1972,19 +1974,17 @@ static int macb_resume(struct platform_device *pdev) > > return 0; > } > -#else > -#define macb_suspend NULL > -#define macb_resume NULL > #endif > > +static SIMPLE_DEV_PM_OPS(macb_pm_ops, macb_suspend, macb_resume); > + > static struct platform_driver macb_driver = { > .remove = __exit_p(macb_remove), > - .suspend = macb_suspend, > - .resume = macb_resume, > .driver = { > .name = "macb", > .owner = THIS_MODULE, > .of_match_table = of_match_ptr(macb_dt_ids), > + .pm = &macb_pm_ops, > }, > }; > >
-- Nicolas Ferre
| |