* [PATCH 1/3] net: ethernet: wiznet: add CONFIG_PM_SLEEP to suspend/resume functions
@ 2013-03-26 7:02 Jingoo Han
2013-03-26 7:03 ` [PATCH 2/3] net: ethernet: atheros: " Jingoo Han
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jingoo Han @ 2013-03-26 7:02 UTC (permalink / raw)
To: 'David S. Miller'; +Cc: netdev, 'Jingoo Han'
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>
---
drivers/net/ethernet/wiznet/w5100.c | 4 ++--
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 545043c..a518dca 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)
return 0;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int w5100_suspend(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
@@ -787,7 +787,7 @@ static int w5100_resume(struct device *dev)
}
return 0;
}
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM_SLEEP */
static SIMPLE_DEV_PM_OPS(w5100_pm_ops, w5100_suspend, w5100_resume);
diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c
index 7cbd0e6..6e00e3f 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)
return 0;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int w5300_suspend(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
@@ -699,7 +699,7 @@ static int w5300_resume(struct device *dev)
}
return 0;
}
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM_SLEEP */
static SIMPLE_DEV_PM_OPS(w5300_pm_ops, w5300_suspend, w5300_resume);
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] net: ethernet: atheros: add CONFIG_PM_SLEEP to suspend/resume functions
2013-03-26 7:02 [PATCH 1/3] net: ethernet: wiznet: add CONFIG_PM_SLEEP to suspend/resume functions Jingoo Han
@ 2013-03-26 7:03 ` Jingoo Han
2013-03-26 16:47 ` David Miller
2013-03-26 7:03 ` [PATCH 3/3] net: wireless: iwlegacy: " Jingoo Han
2013-03-26 16:47 ` [PATCH 1/3] net: ethernet: wiznet: " David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Jingoo Han @ 2013-03-26 7:03 UTC (permalink / raw)
To: 'David S. Miller'; +Cc: netdev, 'Jingoo Han'
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/atheros/atlx/atl1.c:2861:12: warning: 'atl1_resume' defined but not used [-Wunused-function]
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/net/ethernet/atheros/atlx/atl1.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index 5b0d993..9948fee 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -2774,7 +2774,7 @@ static int atl1_close(struct net_device *netdev)
return 0;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int atl1_suspend(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] net: ethernet: atheros: add CONFIG_PM_SLEEP to suspend/resume functions
2013-03-26 7:03 ` [PATCH 2/3] net: ethernet: atheros: " Jingoo Han
@ 2013-03-26 16:47 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2013-03-26 16:47 UTC (permalink / raw)
To: jg1.han; +Cc: netdev
From: Jingoo Han <jg1.han@samsung.com>
Date: Tue, 26 Mar 2013 16:03:25 +0900
> 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/atheros/atlx/atl1.c:2861:12: warning: 'atl1_resume' defined but not used [-Wunused-function]
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Applied to net-next
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] net: wireless: iwlegacy: add CONFIG_PM_SLEEP to suspend/resume functions
2013-03-26 7:02 [PATCH 1/3] net: ethernet: wiznet: add CONFIG_PM_SLEEP to suspend/resume functions Jingoo Han
2013-03-26 7:03 ` [PATCH 2/3] net: ethernet: atheros: " Jingoo Han
@ 2013-03-26 7:03 ` Jingoo Han
2013-03-26 16:47 ` David Miller
2013-03-26 16:47 ` [PATCH 1/3] net: ethernet: wiznet: " David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Jingoo Han @ 2013-03-26 7:03 UTC (permalink / raw)
To: 'David S. Miller'; +Cc: netdev, 'Jingoo Han'
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/wireless/iwlegacy/common.c:4894:1: warning: 'il_pci_suspend' defined but not used [-Wunused-function]
drivers/net/wireless/iwlegacy/common.c:4912:1: warning: 'il_pci_resume' defined but not used [-Wunused-function]
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/net/wireless/iwlegacy/common.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index 01e2d2b..5b79819 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -4888,7 +4888,7 @@ il_add_beacon_time(struct il_priv *il, u32 base, u32 addon,
}
EXPORT_SYMBOL(il_add_beacon_time);
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int
il_pci_suspend(struct device *device)
@@ -4939,7 +4939,7 @@ il_pci_resume(struct device *device)
SIMPLE_DEV_PM_OPS(il_pm_ops, il_pci_suspend, il_pci_resume);
EXPORT_SYMBOL(il_pm_ops);
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM_SLEEP */
static void
il_update_qos(struct il_priv *il)
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] net: wireless: iwlegacy: add CONFIG_PM_SLEEP to suspend/resume functions
2013-03-26 7:03 ` [PATCH 3/3] net: wireless: iwlegacy: " Jingoo Han
@ 2013-03-26 16:47 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2013-03-26 16:47 UTC (permalink / raw)
To: jg1.han; +Cc: netdev
From: Jingoo Han <jg1.han@samsung.com>
Date: Tue, 26 Mar 2013 16:03:51 +0900
> 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/wireless/iwlegacy/common.c:4894:1: warning: 'il_pci_suspend' defined but not used [-Wunused-function]
> drivers/net/wireless/iwlegacy/common.c:4912:1: warning: 'il_pci_resume' defined but not used [-Wunused-function]
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Applied to net-next
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] net: ethernet: wiznet: add CONFIG_PM_SLEEP to suspend/resume functions
2013-03-26 7:02 [PATCH 1/3] net: ethernet: wiznet: add CONFIG_PM_SLEEP to suspend/resume functions Jingoo Han
2013-03-26 7:03 ` [PATCH 2/3] net: ethernet: atheros: " Jingoo Han
2013-03-26 7:03 ` [PATCH 3/3] net: wireless: iwlegacy: " Jingoo Han
@ 2013-03-26 16:47 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2013-03-26 16:47 UTC (permalink / raw)
To: jg1.han; +Cc: netdev
From: Jingoo Han <jg1.han@samsung.com>
Date: Tue, 26 Mar 2013 16:02:55 +0900
> 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>
Applied to net-next
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-03-26 16:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-26 7:02 [PATCH 1/3] net: ethernet: wiznet: add CONFIG_PM_SLEEP to suspend/resume functions Jingoo Han
2013-03-26 7:03 ` [PATCH 2/3] net: ethernet: atheros: " Jingoo Han
2013-03-26 16:47 ` David Miller
2013-03-26 7:03 ` [PATCH 3/3] net: wireless: iwlegacy: " Jingoo Han
2013-03-26 16:47 ` David Miller
2013-03-26 16:47 ` [PATCH 1/3] net: ethernet: wiznet: " David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).