diff options
| author | Alexander Usyskin <alexander.usyskin@intel.com> | 2014-02-18 14:31:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 10:07:01 -0800 |
| commit | 16833257a1ee9f7b2c997f0a26f91b1d9055642c (patch) | |
| tree | 8ae7368b087c2a2ade0dbf8ef8ae617c405f2661 /drivers/misc/mei | |
| parent | 31f88f5739e966cb3c524083e2d19b423ece3585 (diff) | |
| download | linux-stable-16833257a1ee9f7b2c997f0a26f91b1d9055642c.tar.gz linux-stable-16833257a1ee9f7b2c997f0a26f91b1d9055642c.tar.bz2 linux-stable-16833257a1ee9f7b2c997f0a26f91b1d9055642c.zip | |
mei: me: put pm callbacks under PM_SLEEP ifdef
This will eliminate compilation warning:
drivers/misc/mei/pci-me.c:303:12: warning: mei_me_pci_suspend defined but not used [-Wunused-function]
static int mei_me_pci_suspend(struct device *device)
drivers/misc/mei/pci-me.c:323:12: warning: mei_me_pci_resume defined but not used [-Wunused-function]
static int mei_me_pci_resume(struct device *device)
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei')
| -rw-r--r-- | drivers/misc/mei/pci-me.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index 5434354cf1d5..50d9cb52a71f 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -269,7 +269,7 @@ static void mei_me_remove(struct pci_dev *pdev) } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int mei_me_pci_suspend(struct device *device) { struct pci_dev *pdev = to_pci_dev(device); @@ -329,11 +329,12 @@ static int mei_me_pci_resume(struct device *device) return 0; } + static SIMPLE_DEV_PM_OPS(mei_me_pm_ops, mei_me_pci_suspend, mei_me_pci_resume); #define MEI_ME_PM_OPS (&mei_me_pm_ops) #else #define MEI_ME_PM_OPS NULL -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM_SLEEP */ /* * PCI driver structure */ |