2011-03-07 02:15:00

by Michel Lespinasse

Subject: [PATCH] drivers/net: fix build warnings with CONFIG_PM_SLEEP disabled

This fixes a couple of build warnings when CONFIG_PM is enabled but
CONFIG_PM_SLEEP is disabled. Applies on top of v2.6.38-rc7 - I know it's
late, but it would be great if v2.6.38 could compile without warnings!

Signed-off-by: Michel Lespinasse <[email protected]>
---
drivers/net/forcedeth.c | 8 ++++++--
drivers/net/sky2.c | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 9c0b1ba..7b92897 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5744,7 +5744,7 @@ static void __devexit nv_remove(struct pci_dev *pci_dev)
pci_set_drvdata(pci_dev, NULL);
}

-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int nv_suspend(struct device *device)
{
struct pci_dev *pdev = to_pci_dev(device);
@@ -5795,6 +5795,11 @@ static int nv_resume(struct device *device)
static SIMPLE_DEV_PM_OPS(nv_pm_ops, nv_suspend, nv_resume);
#define NV_PM_OPS (&nv_pm_ops)

+#else
+#define NV_PM_OPS NULL
+#endif /* CONFIG_PM_SLEEP */
+
+#ifdef CONFIG_PM
static void nv_shutdown(struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
@@ -5822,7 +5827,6 @@ static void nv_shutdown(struct pci_dev *pdev)
}
}
#else
-#define NV_PM_OPS NULL
#define nv_shutdown NULL
#endif /* CONFIG_PM */

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 7d85a38..2a91868 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4983,7 +4983,7 @@ static int sky2_suspend(struct device *dev)
return 0;
}

-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int sky2_resume(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);

--
Michel "Walken" Lespinasse
A program is never fully debugged until the last user dies.

2011-03-07 23:08:17

by Stephen Hemminger

Subject: Re: [PATCH] drivers/net: fix build warnings with CONFIG_PM_SLEEP disabled

On Sun, 6 Mar 2011 18:14:50 -0800
Michel Lespinasse <[email protected]> wrote:

> This fixes a couple of build warnings when CONFIG_PM is enabled but
> CONFIG_PM_SLEEP is disabled. Applies on top of v2.6.38-rc7 - I know it's
> late, but it would be great if v2.6.38 could compile without warnings!
>
> Signed-off-by: Michel Lespinasse <[email protected]>

This is standard throughout all the network drivers.
Why just fix 2?


--

2011-03-08 00:02:35

by Michel Lespinasse

Subject: Re: [PATCH] drivers/net: fix build warnings with CONFIG_PM_SLEEP disabled

On Mon, Mar 7, 2011 at 3:07 PM, Stephen Hemminger
<[email protected]> wrote:
> On Sun, 6 Mar 2011 18:14:50 -0800
> Michel Lespinasse <[email protected]> wrote:
>
>> This fixes a couple of build warnings when CONFIG_PM is enabled but
>> CONFIG_PM_SLEEP is disabled. Applies on top of v2.6.38-rc7 - I know it's
>> late, but it would be great if v2.6.38 could compile without warnings!
>>
>> Signed-off-by: Michel Lespinasse <[email protected]>
>
> This is standard throughout all the network drivers.
> Why just fix 2?

I only looked at the build warnings we get with our local config.
Some drivers do get this right, such as tg3 for example.

Having a quick look at other SIMPLE_DEV_PM_OPS users, it seems at
least drivers/net/skge.c does have the same issue though.

--
Michel "Walken" Lespinasse
A program is never fully debugged until the last user dies.

2011-03-14 21:26:04

by David Miller

Subject: Re: [PATCH] drivers/net: fix build warnings with CONFIG_PM_SLEEP disabled

From: Michel Lespinasse <[email protected]>
Date: Sun, 6 Mar 2011 18:14:50 -0800

> This fixes a couple of build warnings when CONFIG_PM is enabled but
> CONFIG_PM_SLEEP is disabled. Applies on top of v2.6.38-rc7 - I know it's
> late, but it would be great if v2.6.38 could compile without warnings!
>
> Signed-off-by: Michel Lespinasse <[email protected]>

I know it'd "be great" if this went into 2.6.38 but it doesn't fix
any real bugs, so I'm putting it into net-next-2.6

Thanks.