Merge tag 'amd-drm-next-6.5-2023-06-09' of https://gitlab.freedesktop.org/agd5f/linux...

[J-linux.git] / drivers / pwm / pwm-atmel-hlcdc.c

diff --git a/drivers/pwm/pwm-atmel-hlcdc.c b/drivers/pwm/pwm-atmel-hlcdc.c
index a43b2babc809384002fef48196f3ad73def05924..96a709a9d49a812feb2a24515a78052fe5b65b91 100644 (file)
--- a/drivers/pwm/pwm-atmel-hlcdc.c
+++ b/drivers/pwm/pwm-atmel-hlcdc.c
@@ -278,15 +278,13 @@ static int atmel_hlcdc_pwm_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int atmel_hlcdc_pwm_remove(struct platform_device *pdev)
+static void atmel_hlcdc_pwm_remove(struct platform_device *pdev)
 {
        struct atmel_hlcdc_pwm *chip = platform_get_drvdata(pdev);
 
        pwmchip_remove(&chip->chip);
 
        clk_disable_unprepare(chip->hlcdc->periph_clk);
-
-       return 0;
 }
 
 static const struct of_device_id atmel_hlcdc_pwm_dt_ids[] = {
@@ -301,7 +299,7 @@ static struct platform_driver atmel_hlcdc_pwm_driver = {
                .pm = &atmel_hlcdc_pwm_pm_ops,
        },
        .probe = atmel_hlcdc_pwm_probe,
-       .remove = atmel_hlcdc_pwm_remove,
+       .remove_new = atmel_hlcdc_pwm_remove,
 };
 module_platform_driver(atmel_hlcdc_pwm_driver);