Message ID | 7970145ad4d864eaf31d694d22f2fecbcf6825c9.1422002161.git.michal.simek@xilinx.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Le 23/01/2015 09:36, Michal Simek a écrit : > Fix compilation warning: > drivers/net/ethernet/cadence/macb.c:2415:12: warning: 'macb_suspend' > defined but not used [-Wunused-function] > static int macb_suspend(struct device *dev) > drivers/net/ethernet/cadence/macb.c:2432:12: warning: 'macb_resume' > defined but not used [-Wunused-function] > static int macb_resume(struct device *dev) > > when CONFIG_PM=y, CONFIG_PM_SLEEP=n are used. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> okay: Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- > > drivers/net/ethernet/cadence/macb.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c > index 3767271c7667..23ae32f118c2 100644 > --- a/drivers/net/ethernet/cadence/macb.c > +++ b/drivers/net/ethernet/cadence/macb.c > @@ -2411,8 +2411,7 @@ static int __exit macb_remove(struct platform_device *pdev) > return 0; > } > > -#ifdef CONFIG_PM > -static int macb_suspend(struct device *dev) > +static int __maybe_unused macb_suspend(struct device *dev) > { > struct platform_device *pdev = to_platform_device(dev); > struct net_device *netdev = platform_get_drvdata(pdev); > @@ -2429,7 +2428,7 @@ static int macb_suspend(struct device *dev) > return 0; > } > > -static int macb_resume(struct device *dev) > +static int __maybe_unused macb_resume(struct device *dev) > { > struct platform_device *pdev = to_platform_device(dev); > struct net_device *netdev = platform_get_drvdata(pdev); > @@ -2444,7 +2443,6 @@ static int macb_resume(struct device *dev) > > return 0; > } > -#endif > > static SIMPLE_DEV_PM_OPS(macb_pm_ops, macb_suspend, macb_resume); > > -- > 1.8.2.3 >
From: Michal Simek <michal.simek@xilinx.com> Date: Fri, 23 Jan 2015 09:36:03 +0100 > Fix compilation warning: > drivers/net/ethernet/cadence/macb.c:2415:12: warning: 'macb_suspend' > defined but not used [-Wunused-function] > static int macb_suspend(struct device *dev) > drivers/net/ethernet/cadence/macb.c:2432:12: warning: 'macb_resume' > defined but not used [-Wunused-function] > static int macb_resume(struct device *dev) > > when CONFIG_PM=y, CONFIG_PM_SLEEP=n are used. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 3767271c7667..23ae32f118c2 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -2411,8 +2411,7 @@ static int __exit macb_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM -static int macb_suspend(struct device *dev) +static int __maybe_unused macb_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct net_device *netdev = platform_get_drvdata(pdev); @@ -2429,7 +2428,7 @@ static int macb_suspend(struct device *dev) return 0; } -static int macb_resume(struct device *dev) +static int __maybe_unused macb_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct net_device *netdev = platform_get_drvdata(pdev); @@ -2444,7 +2443,6 @@ static int macb_resume(struct device *dev) return 0; } -#endif static SIMPLE_DEV_PM_OPS(macb_pm_ops, macb_suspend, macb_resume);
Fix compilation warning: drivers/net/ethernet/cadence/macb.c:2415:12: warning: 'macb_suspend' defined but not used [-Wunused-function] static int macb_suspend(struct device *dev) drivers/net/ethernet/cadence/macb.c:2432:12: warning: 'macb_resume' defined but not used [-Wunused-function] static int macb_resume(struct device *dev) when CONFIG_PM=y, CONFIG_PM_SLEEP=n are used. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- drivers/net/ethernet/cadence/macb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 1.8.2.3