diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 15:25:29 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 15:25:29 +1100 |
| commit | ede9f3282e6a4cab7a4c4977413d9c19034b2c48 (patch) | |
| tree | 4365bb50ce973e6ae2b79efba4157c4a6dd0ca3c | |
| parent | 8ef7b197cb80c3f0a98425ca3f6fb5bf6577642f (diff) | |
Revert "ricoh_mmc: Use suspend/resume_noirq"
This reverts commit 75766a3cee0a1eb2f373e8112a73e69262e7831a.
| -rw-r--r-- | drivers/mmc/host/ricoh_mmc.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/drivers/mmc/host/ricoh_mmc.c b/drivers/mmc/host/ricoh_mmc.c index 34064d2f6a66..be9e7b32b34e 100644 --- a/drivers/mmc/host/ricoh_mmc.c +++ b/drivers/mmc/host/ricoh_mmc.c @@ -196,14 +196,10 @@ static void __devexit ricoh_mmc_remove(struct pci_dev *pdev) pci_set_drvdata(pdev, NULL); } -static int ricoh_mmc_suspend_noirq(struct device *dev) +static int ricoh_mmc_suspend(struct pci_dev *pdev, pm_message_t state) { - struct pci_dev *pdev = NULL; struct pci_dev *fw_dev = NULL; - pdev = to_pci_dev(dev); - BUG_ON(pdev == NULL); - fw_dev = pci_get_drvdata(pdev); BUG_ON(fw_dev == NULL); @@ -214,14 +210,10 @@ static int ricoh_mmc_suspend_noirq(struct device *dev) return 0; } -static int ricoh_mmc_resume_noirq(struct device *dev) +static int ricoh_mmc_resume(struct pci_dev *pdev) { - struct pci_dev *pdev = NULL; struct pci_dev *fw_dev = NULL; - pdev = to_pci_dev(dev); - BUG_ON(pdev == NULL); - fw_dev = pci_get_drvdata(pdev); BUG_ON(fw_dev == NULL); @@ -232,17 +224,13 @@ static int ricoh_mmc_resume_noirq(struct device *dev) return 0; } -static struct pm_ext_ops ricoh_mmc_pm_ext_opts = { - .suspend_noirq = ricoh_mmc_suspend_noirq, - .resume_noirq = ricoh_mmc_resume_noirq, -}; - static struct pci_driver ricoh_mmc_driver = { .name = DRIVER_NAME, .id_table = pci_ids, .probe = ricoh_mmc_probe, .remove = __devexit_p(ricoh_mmc_remove), - .pm = &ricoh_mmc_pm_ext_opts, + .suspend = ricoh_mmc_suspend, + .resume = ricoh_mmc_resume, }; /*****************************************************************************\ |