dm: dm-zoned: use __bio_add_page for adding single metadata page

[linux-block.git] / drivers / pwm / pwm-rcar.c

diff --git a/drivers/pwm/pwm-rcar.c b/drivers/pwm/pwm-rcar.c
index 55f46d09602b1907338400fb5887f99e5c87faca..5b5f357c44de61f8d4aa3aef115f314c15bacf1e 100644 (file)
--- a/drivers/pwm/pwm-rcar.c
+++ b/drivers/pwm/pwm-rcar.c
@@ -238,15 +238,13 @@ static int rcar_pwm_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int rcar_pwm_remove(struct platform_device *pdev)
+static void rcar_pwm_remove(struct platform_device *pdev)
 {
        struct rcar_pwm_chip *rcar_pwm = platform_get_drvdata(pdev);
 
        pwmchip_remove(&rcar_pwm->chip);
 
        pm_runtime_disable(&pdev->dev);
-
-       return 0;
 }
 
 static const struct of_device_id rcar_pwm_of_table[] = {
@@ -257,10 +255,10 @@ MODULE_DEVICE_TABLE(of, rcar_pwm_of_table);
 
 static struct platform_driver rcar_pwm_driver = {
        .probe = rcar_pwm_probe,
-       .remove = rcar_pwm_remove,
+       .remove_new = rcar_pwm_remove,
        .driver = {
                .name = "pwm-rcar",
-               .of_match_table = of_match_ptr(rcar_pwm_of_table),
+               .of_match_table = rcar_pwm_of_table,
        }
 };
 module_platform_driver(rcar_pwm_driver);