Merge tag 'for-6.8-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[linux.git] / drivers / mfd / pcf50633-adc.c

diff --git a/drivers/mfd/pcf50633-adc.c b/drivers/mfd/pcf50633-adc.c
index 191b1bc6141c2fa4f2526a6b847d836f0b664664..ab55906f91f98a8eb3cc54e5e9bdaf3e52910535 100644 (file)
--- a/drivers/mfd/pcf50633-adc.c
+++ b/drivers/mfd/pcf50633-adc.c
@@ -218,7 +218,7 @@ static int pcf50633_adc_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int pcf50633_adc_remove(struct platform_device *pdev)
+static void pcf50633_adc_remove(struct platform_device *pdev)
 {
        struct pcf50633_adc *adc = platform_get_drvdata(pdev);
        int i, head;
@@ -236,8 +236,6 @@ static int pcf50633_adc_remove(struct platform_device *pdev)
                kfree(adc->queue[i]);
 
        mutex_unlock(&adc->queue_mutex);
-
-       return 0;
 }
 
 static struct platform_driver pcf50633_adc_driver = {
@@ -245,7 +243,7 @@ static struct platform_driver pcf50633_adc_driver = {
                .name = "pcf50633-adc",
        },
        .probe = pcf50633_adc_probe,
-       .remove = pcf50633_adc_remove,
+       .remove_new = pcf50633_adc_remove,
 };
 
 module_platform_driver(pcf50633_adc_driver);