diff options
| author | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 |
| commit | 1ac731c529cd4d6adbce134754b51ff7d822b145 (patch) | |
| tree | 143ab3f35ca5f3b69f583c84e6964b17139c2ec1 /drivers/media/cec/platform/cec-gpio/cec-gpio.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/media/cec/platform/cec-gpio/cec-gpio.c')
| -rw-r--r-- | drivers/media/cec/platform/cec-gpio/cec-gpio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/cec/platform/cec-gpio/cec-gpio.c b/drivers/media/cec/platform/cec-gpio/cec-gpio.c index c8c4efc83f5f..ff34490fd869 100644 --- a/drivers/media/cec/platform/cec-gpio/cec-gpio.c +++ b/drivers/media/cec/platform/cec-gpio/cec-gpio.c @@ -269,13 +269,12 @@ del_adap: return ret; } -static int cec_gpio_remove(struct platform_device *pdev) +static void cec_gpio_remove(struct platform_device *pdev) { struct cec_gpio *cec = platform_get_drvdata(pdev); cec_notifier_cec_adap_unregister(cec->notifier, cec->adap); cec_unregister_adapter(cec->adap); - return 0; } static const struct of_device_id cec_gpio_match[] = { @@ -288,7 +287,7 @@ MODULE_DEVICE_TABLE(of, cec_gpio_match); static struct platform_driver cec_gpio_pdrv = { .probe = cec_gpio_probe, - .remove = cec_gpio_remove, + .remove_new = cec_gpio_remove, .driver = { .name = "cec-gpio", .of_match_table = cec_gpio_match, |