net/sched: Retire dsmark qdisc

[linux.git] / drivers / pwm / pwm-jz4740.c

diff --git a/drivers/pwm/pwm-jz4740.c b/drivers/pwm/pwm-jz4740.c
index a5fdf97c0d2ec63c4c868fe3a874c05d442b86c1..3b7067f6cd0dc8d664077d23dd7f0345137e8b15 100644 (file)
--- a/drivers/pwm/pwm-jz4740.c
+++ b/drivers/pwm/pwm-jz4740.c
@@ -88,8 +88,7 @@ static int jz4740_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
        struct jz4740_pwm_chip *jz = to_jz4740(chip);
 
        /* Enable PWM output */
-       regmap_update_bits(jz->map, TCU_REG_TCSRc(pwm->hwpwm),
-                          TCU_TCSR_PWM_EN, TCU_TCSR_PWM_EN);
+       regmap_set_bits(jz->map, TCU_REG_TCSRc(pwm->hwpwm), TCU_TCSR_PWM_EN);
 
        /* Start counter */
        regmap_write(jz->map, TCU_REG_TESR, BIT(pwm->hwpwm));
@@ -113,8 +112,7 @@ static void jz4740_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
         * In TCU2 mode (channel 1/2 on JZ4750+), this must be done before the
         * counter is stopped, while in TCU1 mode the order does not matter.
         */
-       regmap_update_bits(jz->map, TCU_REG_TCSRc(pwm->hwpwm),
-                          TCU_TCSR_PWM_EN, 0);
+       regmap_clear_bits(jz->map, TCU_REG_TCSRc(pwm->hwpwm), TCU_TCSR_PWM_EN);
 
        /* Stop counter */
        regmap_write(jz->map, TCU_REG_TECR, BIT(pwm->hwpwm));
@@ -184,8 +182,8 @@ static int jz4740_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
        regmap_write(jz4740->map, TCU_REG_TDFRc(pwm->hwpwm), period);
 
        /* Set abrupt shutdown */
-       regmap_update_bits(jz4740->map, TCU_REG_TCSRc(pwm->hwpwm),
-                          TCU_TCSR_PWM_SD, TCU_TCSR_PWM_SD);
+       regmap_set_bits(jz4740->map, TCU_REG_TCSRc(pwm->hwpwm),
+                       TCU_TCSR_PWM_SD);
 
        /*
         * Set polarity.
@@ -248,19 +246,18 @@ static int jz4740_pwm_probe(struct platform_device *pdev)
        return devm_pwmchip_add(dev, &jz4740->chip);
 }
 
-static const struct soc_info __maybe_unused jz4740_soc_info = {
+static const struct soc_info jz4740_soc_info = {
        .num_pwms = 8,
 };
 
-static const struct soc_info __maybe_unused jz4725b_soc_info = {
+static const struct soc_info jz4725b_soc_info = {
        .num_pwms = 6,
 };
 
-static const struct soc_info __maybe_unused x1000_soc_info = {
+static const struct soc_info x1000_soc_info = {
        .num_pwms = 5,
 };
 
-#ifdef CONFIG_OF
 static const struct of_device_id jz4740_pwm_dt_ids[] = {
        { .compatible = "ingenic,jz4740-pwm", .data = &jz4740_soc_info },
        { .compatible = "ingenic,jz4725b-pwm", .data = &jz4725b_soc_info },
@@ -268,12 +265,11 @@ static const struct of_device_id jz4740_pwm_dt_ids[] = {
        {},
 };
 MODULE_DEVICE_TABLE(of, jz4740_pwm_dt_ids);
-#endif
 
 static struct platform_driver jz4740_pwm_driver = {
        .driver = {
                .name = "jz4740-pwm",
-               .of_match_table = of_match_ptr(jz4740_pwm_dt_ids),
+               .of_match_table = jz4740_pwm_dt_ids,
        },
        .probe = jz4740_pwm_probe,
 };