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

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

diff --git a/drivers/pwm/pwm-spear.c b/drivers/pwm/pwm-spear.c
index 1a1cedfd11ce2dd1253f628580f975da229575d7..4e1cfd8d7c037ee449b28899dd39939449c853a1 100644 (file)
--- a/drivers/pwm/pwm-spear.c
+++ b/drivers/pwm/pwm-spear.c
@@ -75,7 +75,7 @@ static inline void spear_pwm_writel(struct spear_pwm_chip *chip,
 }
 
 static int spear_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
-                           int duty_ns, int period_ns)
+                           u64 duty_ns, u64 period_ns)
 {
        struct spear_pwm_chip *pc = to_spear_pwm_chip(chip);
        u64 val, div, clk_rate;
@@ -163,10 +163,32 @@ static void spear_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
        clk_disable(pc->clk);
 }
 
+static int spear_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
+                          const struct pwm_state *state)
+{
+       int err;
+
+       if (state->polarity != PWM_POLARITY_NORMAL)
+               return -EINVAL;
+
+       if (!state->enabled) {
+               if (pwm->state.enabled)
+                       spear_pwm_disable(chip, pwm);
+               return 0;
+       }
+
+       err = spear_pwm_config(chip, pwm, state->duty_cycle, state->period);
+       if (err)
+               return err;
+
+       if (!pwm->state.enabled)
+               return spear_pwm_enable(chip, pwm);
+
+       return 0;
+}
+
 static const struct pwm_ops spear_pwm_ops = {
-       .config = spear_pwm_config,
-       .enable = spear_pwm_enable,
-       .disable = spear_pwm_disable,
+       .apply = spear_pwm_apply,
        .owner = THIS_MODULE,
 };
 
@@ -225,17 +247,14 @@ static int spear_pwm_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int spear_pwm_remove(struct platform_device *pdev)
+static void spear_pwm_remove(struct platform_device *pdev)
 {
        struct spear_pwm_chip *pc = platform_get_drvdata(pdev);
-       int i;
 
-       for (i = 0; i < NUM_PWM; i++)
-               pwm_disable(&pc->chip.pwms[i]);
+       pwmchip_remove(&pc->chip);
 
        /* clk was prepared in probe, hence unprepare it here */
        clk_unprepare(pc->clk);
-       return pwmchip_remove(&pc->chip);
 }
 
 static const struct of_device_id spear_pwm_of_match[] = {
@@ -252,7 +271,7 @@ static struct platform_driver spear_pwm_driver = {
                .of_match_table = spear_pwm_of_match,
        },
        .probe = spear_pwm_probe,
-       .remove = spear_pwm_remove,
+       .remove_new = spear_pwm_remove,
 };
 
 module_platform_driver(spear_pwm_driver);