]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
gpio-button-hotplug: convert to .remove_new
authorChristian Marangi <ansuelsmth@gmail.com>
Thu, 10 Apr 2025 19:31:02 +0000 (21:31 +0200)
committerChristian Marangi <ansuelsmth@gmail.com>
Fri, 11 Apr 2025 09:21:18 +0000 (11:21 +0200)
Convert package to .remove_new in preparation for kernel 6.12 support.

Link: https://github.com/openwrt/openwrt/pull/18454
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c

index 9876dee90fc8211aa69321a2bfbc9344ae6016e3..ad2e0ca863144aa7b95aeff9d8d791cf0d26f9eb 100644 (file)
@@ -674,7 +674,7 @@ static void gpio_keys_irq_close(struct gpio_keys_button_dev *bdev)
        }
 }
 
-static int gpio_keys_remove(struct platform_device *pdev)
+static void gpio_keys_remove(struct platform_device *pdev)
 {
        struct gpio_keys_button_dev *bdev = platform_get_drvdata(pdev);
 
@@ -684,13 +684,11 @@ static int gpio_keys_remove(struct platform_device *pdev)
                gpio_keys_polled_close(bdev);
        else
                gpio_keys_irq_close(bdev);
-
-       return 0;
 }
 
 static struct platform_driver gpio_keys_driver = {
        .probe  = gpio_keys_probe,
-       .remove = gpio_keys_remove,
+       .remove_new = gpio_keys_remove,
        .driver = {
                .name   = "gpio-keys",
                .of_match_table = of_match_ptr(gpio_keys_of_match),
@@ -699,7 +697,7 @@ static struct platform_driver gpio_keys_driver = {
 
 static struct platform_driver gpio_keys_polled_driver = {
        .probe  = gpio_keys_polled_probe,
-       .remove = gpio_keys_remove,
+       .remove_new = gpio_keys_remove,
        .driver = {
                .name   = "gpio-keys-polled",
                .of_match_table = of_match_ptr(gpio_keys_polled_of_match),