Commit 671a6018 authored Feb 13, 2014 by Jingoo Han Committed by Matthew Wilcox Mar 24, 2014

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>

parent dcb99fd9

drivers/block/nvme-core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -2538,6 +2538,7 @@ static void nvme_remove(struct pci_dev *pdev)
		#define nvme_slot_reset NULL
		#define nvme_error_resume NULL

		#ifdef CONFIG_PM_SLEEP
		static int nvme_suspend(struct device *dev)
		{
		struct pci_dev *pdev = to_pci_dev(dev);
		@@ -2558,6 +2559,7 @@ static int nvme_resume(struct device *dev)
		}
		return 0;
		}
		#endif

		static SIMPLE_DEV_PM_OPS(nvme_dev_pm_ops, nvme_suspend, nvme_resume);