From: Zhang Rui <rui.zhang@intel.com>
To: rjw@rjwysocki.net, kvalo@kernel.org, alexandre.belloni@bootlin.com
Cc: linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-rtc@vger.kernel.org, linux-wireless@vger.kernel.org,
daniel.lezcano@linaro.org, merez@codeaurora.org,
mat.jonczyk@o2.pl, sumeet.r.pawnikar@intel.com,
len.brown@intel.com
Subject: [PATCH 4/7] ACPI: video: improve PM notifer callback
Date: Thu, 5 May 2022 09:58:11 +0800 [thread overview]
Message-ID: <20220505015814.3727692-5-rui.zhang@intel.com> (raw)
In-Reply-To: <20220505015814.3727692-1-rui.zhang@intel.com>
PM notifier callbacks should check for supported events rather than filter
out the unsupported events. So that it won't break when a new event is
introduced.
No functional change in this patch.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Tested-by: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>
---
drivers/acpi/acpi_video.c | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index 990ff5b0aeb8..e07782b1fbb6 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -1707,24 +1707,23 @@ static int acpi_video_resume(struct notifier_block *nb,
int i;
switch (val) {
- case PM_HIBERNATION_PREPARE:
- case PM_SUSPEND_PREPARE:
- case PM_RESTORE_PREPARE:
- return NOTIFY_DONE;
- }
-
- video = container_of(nb, struct acpi_video_bus, pm_nb);
-
- dev_info(&video->device->dev, "Restoring backlight state\n");
+ case PM_POST_HIBERNATION:
+ case PM_POST_SUSPEND:
+ case PM_POST_RESTORE:
+ video = container_of(nb, struct acpi_video_bus, pm_nb);
+
+ dev_info(&video->device->dev, "Restoring backlight state\n");
+
+ for (i = 0; i < video->attached_count; i++) {
+ video_device = video->attached_array[i].bind_info;
+ if (video_device && video_device->brightness)
+ acpi_video_device_lcd_set_level(video_device,
+ video_device->brightness->curr);
+ }
- for (i = 0; i < video->attached_count; i++) {
- video_device = video->attached_array[i].bind_info;
- if (video_device && video_device->brightness)
- acpi_video_device_lcd_set_level(video_device,
- video_device->brightness->curr);
+ return NOTIFY_OK;
}
-
- return NOTIFY_OK;
+ return NOTIFY_DONE;
}
static acpi_status
--
2.17.1
next prev parent reply other threads:[~2022-05-05 1:58 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-05 1:58 [PATCH 0/7] PM: Solution for S0ix failure caused by PCH overheating Zhang Rui
2022-05-05 1:58 ` [PATCH 1/7] PM: wakeup: expose pm_wakeup_pending to modules Zhang Rui
2022-05-05 1:58 ` [PATCH 2/7] thermal: intel: pch: enhance overheat handling Zhang Rui
2022-05-17 15:02 ` Rafael J. Wysocki
2022-05-05 1:58 ` [PATCH 3/7] thermal: intel: pch: improve the cooling delay log Zhang Rui
2022-05-05 1:58 ` Zhang Rui [this message]
2022-05-05 1:58 ` [PATCH 5/7] wil6210: remove debug message for unsupported PM event Zhang Rui
2022-05-05 4:38 ` Kalle Valo
2022-05-05 5:24 ` Zhang Rui
2022-05-06 14:04 ` Kalle Valo
2022-05-07 1:23 ` Zhang Rui
2022-05-05 1:58 ` [PATCH 6/7] PM: suspend: introduce PM_SUSPEND_LATE event Zhang Rui
2022-05-05 1:58 ` [PATCH 7/7] rtc: cmos: Add suspend/resume endurance testing hook Zhang Rui
2022-05-06 21:46 ` Alexandre Belloni
2022-05-07 2:00 ` Zhang Rui
2022-05-07 7:31 ` Alexandre Belloni
2022-05-07 7:41 ` Zhang Rui
2022-05-16 7:50 ` Zhang Rui
2022-05-17 15:14 ` Rafael J. Wysocki
2022-05-18 14:44 ` Zhang Rui
2022-05-18 15:02 ` Rafael J. Wysocki
2022-05-18 16:07 ` Zhang Rui
2022-05-19 2:33 ` Len Brown
2022-05-19 10:56 ` Rafael J. Wysocki
2022-05-05 8:22 ` [PATCH 0/7] PM: Solution for S0ix failure caused by PCH overheating Oliver Neukum
2022-05-05 12:02 ` Rafael J. Wysocki
2022-05-05 15:18 ` Zhang Rui
2022-05-17 15:11 ` Rafael J. Wysocki
2022-05-17 17:07 ` Alexandre Belloni
2022-05-18 14:11 ` Zhang Rui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220505015814.3727692-5-rui.zhang@intel.com \
--to=rui.zhang@intel.com \
--cc=alexandre.belloni@bootlin.com \
--cc=daniel.lezcano@linaro.org \
--cc=kvalo@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=mat.jonczyk@o2.pl \
--cc=merez@codeaurora.org \
--cc=rjw@rjwysocki.net \
--cc=sumeet.r.pawnikar@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).