pwm: make PWM_POLARITY_INVERTED flag optional
authorLothar Waßmann <LW@KARO-electronics.de>
Fri, 7 Mar 2014 08:26:44 +0000 (09:26 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 7 Mar 2014 08:26:44 +0000 (09:26 +0100)
drivers/pwm/core.c

index 608e143..bca83ba 100644 (file)
@@ -131,12 +131,12 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label)
        return 0;
 }
 
-struct pwm_device *
-of_pwm_xlate_with_flags(struct pwm_chip *pc, const struct of_phandle_args *args)
+static struct pwm_device *of_pwm_xlate(struct pwm_chip *pc,
+                               const struct of_phandle_args *args)
 {
        struct pwm_device *pwm;
 
-       if (pc->of_pwm_n_cells < 3)
+       if (pc->of_pwm_n_cells < 2)
                return ERR_PTR(-EINVAL);
 
        if (args->args[0] >= pc->npwm)
@@ -148,6 +148,9 @@ of_pwm_xlate_with_flags(struct pwm_chip *pc, const struct of_phandle_args *args)
 
        pwm_set_period(pwm, args->args[1]);
 
+       if (pc->of_pwm_n_cells < 3)
+               return pwm;
+
        if (args->args[2] & PWM_POLARITY_INVERTED)
                pwm_set_polarity(pwm, PWM_POLARITY_INVERSED);
        else
@@ -155,27 +158,14 @@ of_pwm_xlate_with_flags(struct pwm_chip *pc, const struct of_phandle_args *args)
 
        return pwm;
 }
-EXPORT_SYMBOL_GPL(of_pwm_xlate_with_flags);
 
-static struct pwm_device *
-of_pwm_simple_xlate(struct pwm_chip *pc, const struct of_phandle_args *args)
+struct pwm_device *
+of_pwm_xlate_with_flags(struct pwm_chip *pc,
+                       const struct of_phandle_args *args)
 {
-       struct pwm_device *pwm;
-
-       if (pc->of_pwm_n_cells < 2)
-               return ERR_PTR(-EINVAL);
-
-       if (args->args[0] >= pc->npwm)
-               return ERR_PTR(-EINVAL);
-
-       pwm = pwm_request_from_chip(pc, args->args[0], NULL);
-       if (IS_ERR(pwm))
-               return pwm;
-
-       pwm_set_period(pwm, args->args[1]);
-
-       return pwm;
+       return of_pwm_xlate(pc, args);
 }
+EXPORT_SYMBOL_GPL(of_pwm_xlate_with_flags);
 
 static void of_pwmchip_add(struct pwm_chip *chip)
 {
@@ -183,7 +173,7 @@ static void of_pwmchip_add(struct pwm_chip *chip)
                return;
 
        if (!chip->of_xlate) {
-               chip->of_xlate = of_pwm_simple_xlate;
+               chip->of_xlate = of_pwm_xlate;
                chip->of_pwm_n_cells = 2;
        }
 
@@ -536,13 +526,6 @@ struct pwm_device *of_pwm_get(struct device_node *np, const char *con_id)
                goto put;
        }
 
-       if (args.args_count != pc->of_pwm_n_cells) {
-               pr_err("%s: wrong #pwm-cells for %s\n", np->full_name,
-                        args.np->full_name);
-               pwm = ERR_PTR(-EINVAL);
-               goto put;
-       }
-
        pwm = pc->of_xlate(pc, &args);
        if (IS_ERR(pwm))
                goto put;