diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-03-26 03:01:38 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-04-11 19:01:53 -0400 |
commit | 4eeb587e4b62749c544e0e3bf62c0934d1b3852b (patch) | |
tree | d77b848206a0dc750364c70506543e5a5252cafb /drivers/scsi/isci | |
parent | 7a3ad3920de780e3da1dacabe3c0abcd5b260655 (diff) |
[SCSI] isci: 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/scsi/isci/init.c:725:12: warning: 'isci_suspend' defined but not used [-Wunused-function]
drivers/scsi/isci/init.c:743:12: warning: 'isci_resume' defined but not used [-Wunused-function]
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Lukasz Dorau <lukasz.dorau@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/isci')
-rw-r--r-- | drivers/scsi/isci/init.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index 2839baa82a5a..d25d0d859f05 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c | |||
@@ -721,7 +721,7 @@ static void isci_pci_remove(struct pci_dev *pdev) | |||
721 | } | 721 | } |
722 | } | 722 | } |
723 | 723 | ||
724 | #ifdef CONFIG_PM | 724 | #ifdef CONFIG_PM_SLEEP |
725 | static int isci_suspend(struct device *dev) | 725 | static int isci_suspend(struct device *dev) |
726 | { | 726 | { |
727 | struct pci_dev *pdev = to_pci_dev(dev); | 727 | struct pci_dev *pdev = to_pci_dev(dev); |
@@ -770,18 +770,16 @@ static int isci_resume(struct device *dev) | |||
770 | 770 | ||
771 | return 0; | 771 | return 0; |
772 | } | 772 | } |
773 | #endif | ||
773 | 774 | ||
774 | static SIMPLE_DEV_PM_OPS(isci_pm_ops, isci_suspend, isci_resume); | 775 | static SIMPLE_DEV_PM_OPS(isci_pm_ops, isci_suspend, isci_resume); |
775 | #endif | ||
776 | 776 | ||
777 | static struct pci_driver isci_pci_driver = { | 777 | static struct pci_driver isci_pci_driver = { |
778 | .name = DRV_NAME, | 778 | .name = DRV_NAME, |
779 | .id_table = isci_id_table, | 779 | .id_table = isci_id_table, |
780 | .probe = isci_pci_probe, | 780 | .probe = isci_pci_probe, |
781 | .remove = isci_pci_remove, | 781 | .remove = isci_pci_remove, |
782 | #ifdef CONFIG_PM | ||
783 | .driver.pm = &isci_pm_ops, | 782 | .driver.pm = &isci_pm_ops, |
784 | #endif | ||
785 | }; | 783 | }; |
786 | 784 | ||
787 | static __init int isci_init(void) | 785 | static __init int isci_init(void) |