]> git.karo-electronics.de Git - linux-beck.git/commitdiff
pwm: imx: Remove enabled field from struct imx_chip
authorAxel Lin <axel.lin@ingics.com>
Sun, 31 Mar 2013 14:59:47 +0000 (22:59 +0800)
committerThierry Reding <thierry.reding@avionic-design.de>
Tue, 2 Apr 2013 09:30:57 +0000 (11:30 +0200)
We can test PWMF_ENABLED bit to know if pwm is enabled or not.
Thus remove enabled field from struct imx_chip.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
drivers/pwm/pwm-imx.c

index 3f5677b7690e5c3f8332fde97fa3a62a82fe4a57..ec287989eafc56b89d509e48b3f8ad8999fdc0a7 100644 (file)
@@ -43,7 +43,6 @@ struct imx_chip {
        struct clk      *clk_per;
        struct clk      *clk_ipg;
 
-       int             enabled;
        void __iomem    *mmio_base;
 
        struct pwm_chip chip;
@@ -135,7 +134,7 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
                MX3_PWMCR_DOZEEN | MX3_PWMCR_WAITEN |
                MX3_PWMCR_DBGEN | MX3_PWMCR_CLKSRC_IPG_HIGH;
 
-       if (imx->enabled)
+       if (test_bit(PWMF_ENABLED, &pwm->flags))
                cr |= MX3_PWMCR_EN;
 
        writel(cr, imx->mmio_base + MX3_PWMCR);
@@ -186,8 +185,6 @@ static int imx_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
 
        imx->set_enable(chip, true);
 
-       imx->enabled = 1;
-
        return 0;
 }
 
@@ -198,7 +195,6 @@ static void imx_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
        imx->set_enable(chip, false);
 
        clk_disable_unprepare(imx->clk_per);
-       imx->enabled = 0;
 }
 
 static struct pwm_ops imx_pwm_ops = {