]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ACPI: video: Adjust event notification routine
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 2 Jan 2026 11:52:15 +0000 (12:52 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 15 Jan 2026 13:27:00 +0000 (14:27 +0100)
Adjust acpi_video_bus_notify() to cast its "data" argument to a struct
acpi_video_bus pointer instead of a struct acpi_device one, which allows
the use of acpi_driver_data() to be limited and will facilitate
subsequent changes.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Armin Wolf <W_Armin@gmx.de>
Link: https://patch.msgid.link/2409089.ElGaqSPkdT@rafael.j.wysocki
drivers/acpi/acpi_video.c

index be8e7e18abcab726cb6b06e856df2119ead3b46f..54e09e7f8e774d1ccbca674c3692f2f76e065ba6 100644 (file)
@@ -1540,14 +1540,11 @@ static int acpi_video_bus_stop_devices(struct acpi_video_bus *video)
 
 static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
 {
-       struct acpi_device *device = data;
-       struct acpi_video_bus *video = acpi_driver_data(device);
+       struct acpi_video_bus *video = data;
+       struct acpi_device *device = video->device;
        struct input_dev *input;
        int keycode = 0;
 
-       if (!video || !video->input)
-               return;
-
        input = video->input;
 
        switch (event) {
@@ -2076,7 +2073,7 @@ static int acpi_video_bus_add(struct acpi_device *device)
                goto err_del;
 
        error = acpi_dev_install_notify_handler(device, ACPI_DEVICE_NOTIFY,
-                                               acpi_video_bus_notify, device);
+                                               acpi_video_bus_notify, video);
        if (error)
                goto err_remove;