diff options
author | Jingoo Han <jg1.han@samsung.com> | 2014-02-12 21:19:14 -0500 |
---|---|---|
committer | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2014-03-24 08:05:28 -0400 |
commit | 671a6018db1d359254c8201704cf967efb42fc25 (patch) | |
tree | 82b6d4cc675e2bf4f56eca7799d136660e33bd7b /drivers/block | |
parent | dcb99fd9b08cfe1afe426af4d8d3cbc429190f15 (diff) |
NVMe: Add CONFIG_PM_SLEEP to suspend/resume functions
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/block/nvme-core.c:2541:12: warning: 'nvme_suspend' defined but not used [-Wunused-function]
drivers/block/nvme-core.c:2550:12: warning: 'nvme_resume' defined but not used [-Wunused-function]
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/nvme-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 51824d1f23ea..87dd4c79e65f 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c | |||
@@ -2538,6 +2538,7 @@ static void nvme_remove(struct pci_dev *pdev) | |||
2538 | #define nvme_slot_reset NULL | 2538 | #define nvme_slot_reset NULL |
2539 | #define nvme_error_resume NULL | 2539 | #define nvme_error_resume NULL |
2540 | 2540 | ||
2541 | #ifdef CONFIG_PM_SLEEP | ||
2541 | static int nvme_suspend(struct device *dev) | 2542 | static int nvme_suspend(struct device *dev) |
2542 | { | 2543 | { |
2543 | struct pci_dev *pdev = to_pci_dev(dev); | 2544 | struct pci_dev *pdev = to_pci_dev(dev); |
@@ -2558,6 +2559,7 @@ static int nvme_resume(struct device *dev) | |||
2558 | } | 2559 | } |
2559 | return 0; | 2560 | return 0; |
2560 | } | 2561 | } |
2562 | #endif | ||
2561 | 2563 | ||
2562 | static SIMPLE_DEV_PM_OPS(nvme_dev_pm_ops, nvme_suspend, nvme_resume); | 2564 | static SIMPLE_DEV_PM_OPS(nvme_dev_pm_ops, nvme_suspend, nvme_resume); |
2563 | 2565 | ||