diff options
| author | Tejun Heo <tj@kernel.org> | 2018-08-06 10:22:35 -0700 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2018-08-06 10:22:35 -0700 |
| commit | eac7e072d7e99fad1b6e817c608b03c48205241e (patch) | |
| tree | 6e784ff60407a73b4822560fa0e09517149d3ad1 /drivers/ata/ahci_platform.c | |
| parent | 11c291461b6ea8d1195a96d6bba6673a94aacebc (diff) | |
| download | linux-eac7e072d7e99fad1b6e817c608b03c48205241e.tar.bz2 | |
Revert "ata: ahci_platform: allow disabling of hotplug to save power"
This reverts commit aece27a2f01be4bb7683790f69cd1bed3a0929a2.
Causes boot failure on some devices.
http://lore.kernel.org/r/CA+G9fYuKW_jCFZPqG4tz=QY9ROfHO38KiCp9XTA+KaDOFVtcqQ@mail.gmail.com
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/ahci_platform.c')
| -rw-r--r-- | drivers/ata/ahci_platform.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c index 757729376eda..99f9a895a459 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -68,13 +68,8 @@ disable_resources: return rc; } -#ifdef CONFIG_PM_SLEEP -static const struct dev_pm_ops ahci_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(ahci_platform_suspend, ahci_platform_resume) - SET_RUNTIME_PM_OPS(ahci_platform_runtime_suspend, - ahci_platform_runtime_resume, NULL) -}; -#endif +static SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_platform_suspend, + ahci_platform_resume); static const struct of_device_id ahci_of_match[] = { { .compatible = "generic-ahci", }, @@ -103,9 +98,7 @@ static struct platform_driver ahci_driver = { .name = DRV_NAME, .of_match_table = ahci_of_match, .acpi_match_table = ahci_acpi_match, -#ifdef CONFIG_PM_SLEEP .pm = &ahci_pm_ops, -#endif }, }; module_platform_driver(ahci_driver); |