]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mei: vsc: Use vsc_tp_remove() as shutdown handler
authorHans de Goede <hansg@kernel.org>
Mon, 23 Jun 2025 08:50:46 +0000 (10:50 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Jun 2025 15:39:00 +0000 (16:39 +0100)
After removing the vsc_tp_reset() call from vsc_tp_shutdown() it is now
identical to vsc_tp_remove().

Use vsc_tp_remove() as shutdown handler and remove vsc_tp_shutdown().

Signed-off-by: Hans de Goede <hansg@kernel.org>
Link: https://lore.kernel.org/r/20250623085052.12347-5-hansg@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/mei/vsc-tp.c

index 4a262e2117e4430f92e4ac074b6e2bc8da4b339b..f5438a600430cf7d7c5368f91929191577300fb8 100644 (file)
@@ -528,6 +528,7 @@ err_destroy_lock:
        return ret;
 }
 
+/* Note this is also used for shutdown */
 static void vsc_tp_remove(struct spi_device *spi)
 {
        struct vsc_tp *tp = spi_get_drvdata(spi);
@@ -539,17 +540,6 @@ static void vsc_tp_remove(struct spi_device *spi)
        free_irq(spi->irq, tp);
 }
 
-static void vsc_tp_shutdown(struct spi_device *spi)
-{
-       struct vsc_tp *tp = spi_get_drvdata(spi);
-
-       platform_device_unregister(tp->pdev);
-
-       mutex_destroy(&tp->mutex);
-
-       free_irq(spi->irq, tp);
-}
-
 static const struct acpi_device_id vsc_tp_acpi_ids[] = {
        { "INTC1009" }, /* Raptor Lake */
        { "INTC1058" }, /* Tiger Lake */
@@ -562,7 +552,7 @@ MODULE_DEVICE_TABLE(acpi, vsc_tp_acpi_ids);
 static struct spi_driver vsc_tp_driver = {
        .probe = vsc_tp_probe,
        .remove = vsc_tp_remove,
-       .shutdown = vsc_tp_shutdown,
+       .shutdown = vsc_tp_remove,
        .driver = {
                .name = "vsc-tp",
                .acpi_match_table = vsc_tp_acpi_ids,