]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
platform/x86: panasonic-laptop: Remove redundant checks from 3 functions
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 20 Mar 2026 10:33:03 +0000 (11:33 +0100)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Mon, 23 Mar 2026 09:33:55 +0000 (11:33 +0200)
The device pointer cannot be NULL in acpi_pcc_hotkey_add() and
acpi_pcc_hotkey_remove() because these functions are ACPI driver
callbacks and NULL is never passed to any of them as an argument.

Likewise, acpi_pcc_hotkey_resume() is a resume callback of a
device driver and NULL is never passed to it as an argument, so
the dev pointer in it cannot be NULL.

Moreover, since acpi_pcc_hotkey_remove() and acpi_pcc_hotkey_resume()
can only run after acpi_pcc_hotkey_add() has completed successfully,
the acpi_driver_data() of the device object used by them cannot be
NULL when they run.

Drop all of the redundant NULL checks of the pointers mentioned above.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/1957824.tdWV9SEqCh@rafael.j.wysocki
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/platform/x86/panasonic-laptop.c

index 56b4e61d7e5c88016341f29e88f5328f94f80c9f..188ec597a14e5e521286a381bb6430b8a89c2437 100644 (file)
@@ -965,14 +965,7 @@ static int acpi_pcc_init_input(struct pcc_acpi *pcc)
 #ifdef CONFIG_PM_SLEEP
 static int acpi_pcc_hotkey_resume(struct device *dev)
 {
-       struct pcc_acpi *pcc;
-
-       if (!dev)
-               return -EINVAL;
-
-       pcc = acpi_driver_data(to_acpi_device(dev));
-       if (!pcc)
-               return -EINVAL;
+       struct pcc_acpi *pcc = acpi_driver_data(to_acpi_device(dev));
 
        if (pcc->num_sifr > SINF_MUTE)
                acpi_pcc_write_sset(pcc, SINF_MUTE, pcc->mute);
@@ -994,9 +987,6 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device)
        struct pcc_acpi *pcc;
        int num_sifr, result;
 
-       if (!device)
-               return -EINVAL;
-
        num_sifr = acpi_pcc_get_sqty(device);
 
        /*
@@ -1121,9 +1111,6 @@ static void acpi_pcc_hotkey_remove(struct acpi_device *device)
 {
        struct pcc_acpi *pcc = acpi_driver_data(device);
 
-       if (!device || !pcc)
-               return;
-
        i8042_remove_filter(panasonic_i8042_filter);
 
        if (pcc->platform) {