UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Jingoo Han 2013-03-26 16:01:38 +09:00 committed by James Bottomley
parent 7a3ad3920d
commit 4eeb587e4b
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/isci/init.c
View File

@ -721,7 +721,7 @@ static void isci_pci_remove(struct pci_dev *pdev)
} }
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int isci_suspend(struct device *dev) static int isci_suspend(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
@ -770,18 +770,16 @@ static int isci_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(isci_pm_ops, isci_suspend, isci_resume); static SIMPLE_DEV_PM_OPS(isci_pm_ops, isci_suspend, isci_resume);
#endif
static struct pci_driver isci_pci_driver = { static struct pci_driver isci_pci_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = isci_id_table, .id_table = isci_id_table,
.probe = isci_pci_probe, .probe = isci_pci_probe,
.remove = isci_pci_remove, .remove = isci_pci_remove,
#ifdef CONFIG_PM
.driver.pm = &isci_pm_ops, .driver.pm = &isci_pm_ops,
#endif
}; };
static __init int isci_init(void) static __init int isci_init(void)