Skip to content

Commit 045a072

Browse files
committed
mei: vsc: Use vsc_tp_remove() as shutdown handler
JIRA: https://issues.redhat.com/browse/RHEL-113185 commit 78ab08e Author: Hans de Goede <hansg@kernel.org> Date: Mon Jun 23 10:50:46 2025 +0200 mei: vsc: Use vsc_tp_remove() as shutdown handler 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> Signed-off-by: Steve Best <sbest@redhat.com>
1 parent c5bb4e4 commit 045a072

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

drivers/misc/mei/vsc-tp.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,7 @@ static int vsc_tp_probe(struct spi_device *spi)
528528
return ret;
529529
}
530530

531+
/* Note this is also used for shutdown */
531532
static void vsc_tp_remove(struct spi_device *spi)
532533
{
533534
struct vsc_tp *tp = spi_get_drvdata(spi);
@@ -539,17 +540,6 @@ static void vsc_tp_remove(struct spi_device *spi)
539540
free_irq(spi->irq, tp);
540541
}
541542

542-
static void vsc_tp_shutdown(struct spi_device *spi)
543-
{
544-
struct vsc_tp *tp = spi_get_drvdata(spi);
545-
546-
platform_device_unregister(tp->pdev);
547-
548-
mutex_destroy(&tp->mutex);
549-
550-
free_irq(spi->irq, tp);
551-
}
552-
553543
static const struct acpi_device_id vsc_tp_acpi_ids[] = {
554544
{ "INTC1009" }, /* Raptor Lake */
555545
{ "INTC1058" }, /* Tiger Lake */
@@ -562,7 +552,7 @@ MODULE_DEVICE_TABLE(acpi, vsc_tp_acpi_ids);
562552
static struct spi_driver vsc_tp_driver = {
563553
.probe = vsc_tp_probe,
564554
.remove = vsc_tp_remove,
565-
.shutdown = vsc_tp_shutdown,
555+
.shutdown = vsc_tp_remove,
566556
.driver = {
567557
.name = "vsc-tp",
568558
.acpi_match_table = vsc_tp_acpi_ids,

0 commit comments

Comments
 (0)