Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94252763 authored by Michel Lespinasse's avatar Michel Lespinasse Committed by David S. Miller
Browse files

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: default avatarMichel Lespinasse <walken@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b3017e6a

drivers/net/forcedeth.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -5744,7 +5744,7 @@ static void __devexit nv_remove(struct pci_dev *pci_dev) 
	pci_set_drvdata(pci_dev, NULL);

	pci_set_drvdata(pci_dev, NULL);

}

}





#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int nv_suspend(struct device *device)

static int nv_suspend(struct device *device)

{

{

	struct pci_dev *pdev = to_pci_dev(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);

static SIMPLE_DEV_PM_OPS(nv_pm_ops, nv_suspend, nv_resume);

#define NV_PM_OPS (&nv_pm_ops)

#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)

static void nv_shutdown(struct pci_dev *pdev)

{

{

	struct net_device *dev = pci_get_drvdata(pdev);

	struct net_device *dev = pci_get_drvdata(pdev);
@@ -5822,7 +5827,6 @@ static void nv_shutdown(struct pci_dev *pdev) 
	}

	}

}

}

#else

#else

#define NV_PM_OPS NULL

#define nv_shutdown NULL

#define nv_shutdown NULL

#endif /* CONFIG_PM */

#endif /* CONFIG_PM */

drivers/net/sky2.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -4983,7 +4983,7 @@ static int sky2_suspend(struct device *dev) 
	return 0;

	return 0;

}

}





#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int sky2_resume(struct device *dev)

static int sky2_resume(struct device *dev)

{

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct pci_dev *pdev = to_pci_dev(dev);