aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/memstick/host/r592.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/memstick/host/r592.c')
-rw-r--r--drivers/memstick/host/r592.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index a7c5b31c0d50..9718661c1fb6 100644
--- a/drivers/memstick/host/r592.c
+++ b/drivers/memstick/host/r592.c
@@ -847,7 +847,7 @@ static void r592_remove(struct pci_dev *pdev)
847 dev->dummy_dma_page_physical_address); 847 dev->dummy_dma_page_physical_address);
848} 848}
849 849
850#ifdef CONFIG_PM 850#ifdef CONFIG_PM_SLEEP
851static int r592_suspend(struct device *core_dev) 851static int r592_suspend(struct device *core_dev)
852{ 852{
853 struct pci_dev *pdev = to_pci_dev(core_dev); 853 struct pci_dev *pdev = to_pci_dev(core_dev);
@@ -870,10 +870,10 @@ static int r592_resume(struct device *core_dev)
870 r592_update_card_detect(dev); 870 r592_update_card_detect(dev);
871 return 0; 871 return 0;
872} 872}
873
874SIMPLE_DEV_PM_OPS(r592_pm_ops, r592_suspend, r592_resume);
875#endif 873#endif
876 874
875static SIMPLE_DEV_PM_OPS(r592_pm_ops, r592_suspend, r592_resume);
876
877MODULE_DEVICE_TABLE(pci, r592_pci_id_tbl); 877MODULE_DEVICE_TABLE(pci, r592_pci_id_tbl);
878 878
879static struct pci_driver r852_pci_driver = { 879static struct pci_driver r852_pci_driver = {
@@ -881,9 +881,7 @@ static struct pci_driver r852_pci_driver = {
881 .id_table = r592_pci_id_tbl, 881 .id_table = r592_pci_id_tbl,
882 .probe = r592_probe, 882 .probe = r592_probe,
883 .remove = r592_remove, 883 .remove = r592_remove,
884#ifdef CONFIG_PM
885 .driver.pm = &r592_pm_ops, 884 .driver.pm = &r592_pm_ops,
886#endif
887}; 885};
888 886
889static __init int r592_module_init(void) 887static __init int r592_module_init(void)