drivers/memstick/host/r592.c: make r592_pm_ops static
r592_pm_ops is not exported. Also, CONFIG_PM_SLEEP is used to remove unnecessary ifdefs. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Cc: Maxim Levitsky <maximlevitsky@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
06a6ea3702
commit
8d46fa1179
|
@ -847,7 +847,7 @@ static void r592_remove(struct pci_dev *pdev)
|
|||
dev->dummy_dma_page_physical_address);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int r592_suspend(struct device *core_dev)
|
||||
{
|
||||
struct pci_dev *pdev = to_pci_dev(core_dev);
|
||||
|
@ -870,10 +870,10 @@ static int r592_resume(struct device *core_dev)
|
|||
r592_update_card_detect(dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
SIMPLE_DEV_PM_OPS(r592_pm_ops, r592_suspend, r592_resume);
|
||||
#endif
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(r592_pm_ops, r592_suspend, r592_resume);
|
||||
|
||||
MODULE_DEVICE_TABLE(pci, r592_pci_id_tbl);
|
||||
|
||||
static struct pci_driver r852_pci_driver = {
|
||||
|
@ -881,9 +881,7 @@ static struct pci_driver r852_pci_driver = {
|
|||
.id_table = r592_pci_id_tbl,
|
||||
.probe = r592_probe,
|
||||
.remove = r592_remove,
|
||||
#ifdef CONFIG_PM
|
||||
.driver.pm = &r592_pm_ops,
|
||||
#endif
|
||||
};
|
||||
|
||||
static __init int r592_module_init(void)
|
||||
|
|
Loading…
Reference in New Issue