Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7fa69baf29de8c77a6b32c054df2abb8f11f8aa4

Authored by Rafael J. Wysocki
Committed by Len Brown
1 parent f2b56bc808
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ACPI / PM: Drop special ACPI wakeup flags 

Drop special ACPI wakeup flags, wakeup.state.enabled and
wakeup.flags.always_enabled, that aren't necessary any more after
we've started to use standard device wakeup flags for handling ACPI
wakeup devices.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>

Showing 2 changed files with 1 additions and 10 deletions Side-by-side Diff

... ... @@ -167,11 +167,8 @@
167 167 "firmware_node");
168 168 ret = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,
169 169 "physical_node");
170   - if (acpi_dev->wakeup.flags.valid) {
  170 + if (acpi_dev->wakeup.flags.valid)
171 171 device_set_wakeup_capable(dev, true);
172   - device_set_wakeup_enable(dev,
173   - acpi_dev->wakeup.state.enabled);
174   - }
175 172 }
176 173  
177 174 return 0;
include/acpi/acpi_bus.h
Diff comments   View file @ 7fa69ba
... ... @@ -242,20 +242,14 @@
242 242 struct acpi_device_wakeup_flags {
243 243 u8 valid:1; /* Can successfully enable wakeup? */
244 244 u8 run_wake:1; /* Run-Wake GPE devices */
245   - u8 always_enabled:1; /* Run-wake devices that are always enabled */
246 245 u8 notifier_present:1; /* Wake-up notify handler has been installed */
247 246 };
248 247  
249   -struct acpi_device_wakeup_state {
250   - u8 enabled:1;
251   -};
252   -
253 248 struct acpi_device_wakeup {
254 249 acpi_handle gpe_device;
255 250 u64 gpe_number;
256 251 u64 sleep_state;
257 252 struct acpi_handle_list resources;
258   - struct acpi_device_wakeup_state state;
259 253 struct acpi_device_wakeup_flags flags;
260 254 int prepare_count;
261 255 int run_wake_count;