diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-08-30 16:06:38 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-08-30 16:06:38 -0700 |
| commit | 1ac731c529cd4d6adbce134754b51ff7d822b145 (patch) | |
| tree | 143ab3f35ca5f3b69f583c84e6964b17139c2ec1 /drivers/platform/x86/amd/hsmp.c | |
| parent | 07b4c950f27bef0362dc6ad7ee713aab61d58149 (diff) | |
| parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.6 merge window.
Diffstat (limited to 'drivers/platform/x86/amd/hsmp.c')
| -rw-r--r-- | drivers/platform/x86/amd/hsmp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c index 521c6a229362c..31382ef52efb6 100644 --- a/drivers/platform/x86/amd/hsmp.c +++ b/drivers/platform/x86/amd/hsmp.c @@ -340,16 +340,14 @@ static int hsmp_pltdrv_probe(struct platform_device *pdev) return misc_register(&hsmp_device); } -static int hsmp_pltdrv_remove(struct platform_device *pdev) +static void hsmp_pltdrv_remove(struct platform_device *pdev) { misc_deregister(&hsmp_device); - - return 0; } static struct platform_driver amd_hsmp_driver = { .probe = hsmp_pltdrv_probe, - .remove = hsmp_pltdrv_remove, + .remove_new = hsmp_pltdrv_remove, .driver = { .name = DRIVER_NAME, }, |