diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-08-31 02:06:38 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-08-31 02:06:38 +0300 |
| commit | 1ac731c529cd4d6adbce134754b51ff7d822b145 (patch) | |
| tree | 143ab3f35ca5f3b69f583c84e6964b17139c2ec1 /drivers/platform/x86/barco-p50-gpio.c | |
| parent | 07b4c950f27bef0362dc6ad7ee713aab61d58149 (diff) | |
| parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
| download | linux-1ac731c529cd4d6adbce134754b51ff7d822b145.tar.xz | |
Merge branch 'next' into for-linus
Prepare input updates for 6.6 merge window.
Diffstat (limited to 'drivers/platform/x86/barco-p50-gpio.c')
| -rw-r--r-- | drivers/platform/x86/barco-p50-gpio.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/platform/x86/barco-p50-gpio.c b/drivers/platform/x86/barco-p50-gpio.c index 8dd672339485..af566f712057 100644 --- a/drivers/platform/x86/barco-p50-gpio.c +++ b/drivers/platform/x86/barco-p50-gpio.c @@ -370,7 +370,7 @@ err_leds: return ret; } -static int p50_gpio_remove(struct platform_device *pdev) +static void p50_gpio_remove(struct platform_device *pdev) { struct p50_gpio *p50 = platform_get_drvdata(pdev); @@ -378,8 +378,6 @@ static int p50_gpio_remove(struct platform_device *pdev) platform_device_unregister(p50->leds_pdev); gpiod_remove_lookup_table(&p50_gpio_led_table); - - return 0; } static struct platform_driver p50_gpio_driver = { @@ -387,7 +385,7 @@ static struct platform_driver p50_gpio_driver = { .name = DRIVER_NAME, }, .probe = p50_gpio_probe, - .remove = p50_gpio_remove, + .remove_new = p50_gpio_remove, }; /* Board setup */ |