From: Borislav Petkov bp@suse.de
This patch has been added to the 4.1 stable tree. If you have any objections, please let us know.
===============
[ Upstream commit 91eefaabf102c539e6f5531e9a1e5ed46d2b41ca ]
Fix:
drivers/net/ethernet/amd/xgbe/xgbe-main.c:835:12: warning: ‘xgbe_suspend’ defined but not used [-Wunused-function] drivers/net/ethernet/amd/xgbe/xgbe-main.c:855:12: warning: ‘xgbe_resume’ defined but not used [-Wunused-function]
I see it during randconfig builds here.
Signed-off-by: Borislav Petkov bp@suse.de Cc: Tom Lendacky thomas.lendacky@amd.com Cc: netdev@vger.kernel.org Signed-off-by: David S. Miller davem@davemloft.net Signed-off-by: Sasha Levin alexander.levin@microsoft.com --- drivers/net/ethernet/amd/xgbe/xgbe-main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c index 714905384900..5feddde71f18 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c @@ -553,7 +553,7 @@ static int xgbe_remove(struct platform_device *pdev) return 0; }
-#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int xgbe_suspend(struct device *dev) { struct net_device *netdev = dev_get_drvdata(dev); @@ -591,7 +591,7 @@ static int xgbe_resume(struct device *dev)
return ret; } -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM_SLEEP */
#ifdef CONFIG_ACPI static const struct acpi_device_id xgbe_acpi_match[] = {