瀏覽代碼

pwm: Check for negative duty-cycle and period

Make sure the duty-cycle and period passed in are not negative. This
should eventually be made implicit by making them unsigned. While at
it, the drivers' .config() implementations can have the equivalent
checks removed.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Axel Lin <axel.lin@gmail.com>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Jingoo Han <jg1.han@samsung.com>
Cc: Jonghwan Choi <jhbird.choi@samsung.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: "Philip, Avinash" <avinashphilip@ti.com>
Cc: Vaibhav Bedia <vaibhav.bedia@ti.com>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Thierry Reding 13 年之前
父節點
當前提交
c2d476a98f
共有 6 個文件被更改,包括 3 次插入12 次删除
  1. 1 1
      drivers/pwm/core.c
  2. 0 3
      drivers/pwm/pwm-bfin.c
  3. 0 3
      drivers/pwm/pwm-pxa.c
  4. 0 3
      drivers/pwm/pwm-samsung.c
  5. 1 1
      drivers/pwm/pwm-tiecap.c
  6. 1 1
      drivers/pwm/pwm-tiehrpwm.c

+ 1 - 1
drivers/pwm/core.c

@@ -371,7 +371,7 @@ EXPORT_SYMBOL_GPL(pwm_free);
  */
  */
 int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns)
 int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns)
 {
 {
-	if (!pwm || period_ns == 0 || duty_ns > period_ns)
+	if (!pwm || duty_ns < 0 || period_ns <= 0 || duty_ns > period_ns)
 		return -EINVAL;
 		return -EINVAL;
 
 
 	return pwm->chip->ops->config(pwm->chip, pwm, duty_ns, period_ns);
 	return pwm->chip->ops->config(pwm->chip, pwm, duty_ns, period_ns);

+ 0 - 3
drivers/pwm/pwm-bfin.c

@@ -69,9 +69,6 @@ static int bfin_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
 	unsigned long period, duty;
 	unsigned long period, duty;
 	unsigned long long val;
 	unsigned long long val;
 
 
-	if (duty_ns < 0 || duty_ns > period_ns)
-		return -EINVAL;
-
 	val = (unsigned long long)get_sclk() * period_ns;
 	val = (unsigned long long)get_sclk() * period_ns;
 	do_div(val, NSEC_PER_SEC);
 	do_div(val, NSEC_PER_SEC);
 	period = val;
 	period = val;

+ 0 - 3
drivers/pwm/pwm-pxa.c

@@ -70,9 +70,6 @@ static int pxa_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
 	unsigned long offset;
 	unsigned long offset;
 	int rc;
 	int rc;
 
 
-	if (period_ns == 0 || duty_ns > period_ns)
-		return -EINVAL;
-
 	offset = pwm->hwpwm ? 0x10 : 0;
 	offset = pwm->hwpwm ? 0x10 : 0;
 
 
 	c = clk_get_rate(pc->clk);
 	c = clk_get_rate(pc->clk);

+ 0 - 3
drivers/pwm/pwm-samsung.c

@@ -126,9 +126,6 @@ static int s3c_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
 	if (period_ns > NS_IN_HZ || duty_ns > NS_IN_HZ)
 	if (period_ns > NS_IN_HZ || duty_ns > NS_IN_HZ)
 		return -ERANGE;
 		return -ERANGE;
 
 
-	if (duty_ns > period_ns)
-		return -EINVAL;
-
 	if (period_ns == s3c->period_ns &&
 	if (period_ns == s3c->period_ns &&
 	    duty_ns == s3c->duty_ns)
 	    duty_ns == s3c->duty_ns)
 		return 0;
 		return 0;

+ 1 - 1
drivers/pwm/pwm-tiecap.c

@@ -60,7 +60,7 @@ static int ecap_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
 	unsigned long period_cycles, duty_cycles;
 	unsigned long period_cycles, duty_cycles;
 	unsigned int reg_val;
 	unsigned int reg_val;
 
 
-	if (period_ns < 0 || duty_ns < 0 || period_ns > NSEC_PER_SEC)
+	if (period_ns > NSEC_PER_SEC)
 		return -ERANGE;
 		return -ERANGE;
 
 
 	c = pc->clk_rate;
 	c = pc->clk_rate;

+ 1 - 1
drivers/pwm/pwm-tiehrpwm.c

@@ -221,7 +221,7 @@ static int ehrpwm_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
 	unsigned short ps_divval, tb_divval;
 	unsigned short ps_divval, tb_divval;
 	int i, cmp_reg;
 	int i, cmp_reg;
 
 
-	if (period_ns < 0 || duty_ns < 0 || period_ns > NSEC_PER_SEC)
+	if (period_ns > NSEC_PER_SEC)
 		return -ERANGE;
 		return -ERANGE;
 
 
 	c = pc->clk_rate;
 	c = pc->clk_rate;