diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-03-25 17:02:55 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-26 12:47:17 -0400 |
commit | 4294bebaff0d3f10629a8282eae76193a7598b8f (patch) | |
tree | 8bbe51722d1f4d0c7610aa2b5868d2e8079a0b36 /drivers/net/ethernet/wiznet | |
parent | 33b7f0282e077db234afcf368a7a179b638e50a2 (diff) |
net: ethernet: wiznet: add CONFIG_PM_SLEEP to suspend/resume functions
Add CONFIG_PM_SLEEP to suspend/resume functions to fix the following
build warning when CONFIG_PM_SLEEP is not selected. This is because
sleep PM callbacks defined by SIMPLE_DEV_PM_OPS are only used when
the CONFIG_PM_SLEEP is enabled.
drivers/net/ethernet/wiznet/w5100.c:758:12: warning: 'w5100_suspend' defined but not used [-Wunused-function]
drivers/net/ethernet/wiznet/w5100.c:773:12: warning: 'w5100_resume' defined but not used [-Wunused-function]
drivers/net/ethernet/wiznet/w5300.c:670:12: warning: 'w5300_suspend' defined but not used [-Wunused-function]
drivers/net/ethernet/wiznet/w5300.c:685:12: warning: 'w5300_resume' defined but not used [-Wunused-function]
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/wiznet')
-rw-r--r-- | drivers/net/ethernet/wiznet/w5100.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/wiznet/w5300.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c index 545043cc4c0b..a518dcab396e 100644 --- a/drivers/net/ethernet/wiznet/w5100.c +++ b/drivers/net/ethernet/wiznet/w5100.c | |||
@@ -754,7 +754,7 @@ static int w5100_remove(struct platform_device *pdev) | |||
754 | return 0; | 754 | return 0; |
755 | } | 755 | } |
756 | 756 | ||
757 | #ifdef CONFIG_PM | 757 | #ifdef CONFIG_PM_SLEEP |
758 | static int w5100_suspend(struct device *dev) | 758 | static int w5100_suspend(struct device *dev) |
759 | { | 759 | { |
760 | struct platform_device *pdev = to_platform_device(dev); | 760 | struct platform_device *pdev = to_platform_device(dev); |
@@ -787,7 +787,7 @@ static int w5100_resume(struct device *dev) | |||
787 | } | 787 | } |
788 | return 0; | 788 | return 0; |
789 | } | 789 | } |
790 | #endif /* CONFIG_PM */ | 790 | #endif /* CONFIG_PM_SLEEP */ |
791 | 791 | ||
792 | static SIMPLE_DEV_PM_OPS(w5100_pm_ops, w5100_suspend, w5100_resume); | 792 | static SIMPLE_DEV_PM_OPS(w5100_pm_ops, w5100_suspend, w5100_resume); |
793 | 793 | ||
diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c index 7cbd0e6fc6f3..6e00e3f94ce4 100644 --- a/drivers/net/ethernet/wiznet/w5300.c +++ b/drivers/net/ethernet/wiznet/w5300.c | |||
@@ -666,7 +666,7 @@ static int w5300_remove(struct platform_device *pdev) | |||
666 | return 0; | 666 | return 0; |
667 | } | 667 | } |
668 | 668 | ||
669 | #ifdef CONFIG_PM | 669 | #ifdef CONFIG_PM_SLEEP |
670 | static int w5300_suspend(struct device *dev) | 670 | static int w5300_suspend(struct device *dev) |
671 | { | 671 | { |
672 | struct platform_device *pdev = to_platform_device(dev); | 672 | struct platform_device *pdev = to_platform_device(dev); |
@@ -699,7 +699,7 @@ static int w5300_resume(struct device *dev) | |||
699 | } | 699 | } |
700 | return 0; | 700 | return 0; |
701 | } | 701 | } |
702 | #endif /* CONFIG_PM */ | 702 | #endif /* CONFIG_PM_SLEEP */ |
703 | 703 | ||
704 | static SIMPLE_DEV_PM_OPS(w5300_pm_ops, w5300_suspend, w5300_resume); | 704 | static SIMPLE_DEV_PM_OPS(w5300_pm_ops, w5300_suspend, w5300_resume); |
705 | 705 | ||