Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux-2.6-microblaze.git] / drivers / power / supply / tps65217_charger.c

diff --git a/drivers/power/supply/tps65217_charger.c b/drivers/power/supply/tps65217_charger.c
index 6dffe9c..2382749 100644 (file)
--- a/drivers/power/supply/tps65217_charger.c
+++ b/drivers/power/supply/tps65217_charger.c
@@ -253,14 +253,12 @@ static int tps65217_charger_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int tps65217_charger_remove(struct platform_device *pdev)
+static void tps65217_charger_remove(struct platform_device *pdev)
 {
        struct tps65217_charger *charger = platform_get_drvdata(pdev);
 
        if (charger->poll_task)
                kthread_stop(charger->poll_task);
-
-       return 0;
 }
 
 static const struct of_device_id tps65217_charger_match_table[] = {
@@ -271,7 +269,7 @@ MODULE_DEVICE_TABLE(of, tps65217_charger_match_table);
 
 static struct platform_driver tps65217_charger_driver = {
        .probe  = tps65217_charger_probe,
-       .remove = tps65217_charger_remove,
+       .remove_new = tps65217_charger_remove,
        .driver = {
                .name   = "tps65217-charger",
                .of_match_table = of_match_ptr(tps65217_charger_match_table),