aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei
diff options
context:
space:
mode:
authorAlexander Usyskin <alexander.usyskin@intel.com>2014-02-18 07:31:08 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-18 13:07:01 -0500
commit16833257a1ee9f7b2c997f0a26f91b1d9055642c (patch)
tree8ae7368b087c2a2ade0dbf8ef8ae617c405f2661 /drivers/misc/mei
parent31f88f5739e966cb3c524083e2d19b423ece3585 (diff)
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.c5
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)
269 269
270 270
271} 271}
272#ifdef CONFIG_PM 272#ifdef CONFIG_PM_SLEEP
273static int mei_me_pci_suspend(struct device *device) 273static int mei_me_pci_suspend(struct device *device)
274{ 274{
275 struct pci_dev *pdev = to_pci_dev(device); 275 struct pci_dev *pdev = to_pci_dev(device);
@@ -329,11 +329,12 @@ static int mei_me_pci_resume(struct device *device)
329 329
330 return 0; 330 return 0;
331} 331}
332
332static SIMPLE_DEV_PM_OPS(mei_me_pm_ops, mei_me_pci_suspend, mei_me_pci_resume); 333static SIMPLE_DEV_PM_OPS(mei_me_pm_ops, mei_me_pci_suspend, mei_me_pci_resume);
333#define MEI_ME_PM_OPS (&mei_me_pm_ops) 334#define MEI_ME_PM_OPS (&mei_me_pm_ops)
334#else 335#else
335#define MEI_ME_PM_OPS NULL 336#define MEI_ME_PM_OPS NULL
336#endif /* CONFIG_PM */ 337#endif /* CONFIG_PM_SLEEP */
337/* 338/*
338 * PCI driver structure 339 * PCI driver structure
339 */ 340 */