Re: [PATCH 3/3] pwm: pxa: Remove clk_enabled field from struct pxa_pwm_chip

[Eric Miao]

On Sun, Mar 31, 2013 at 11:04 PM, Axel Lin <axel.lin@xxxxxxxxxx> wrote:
> clk_enable/clk_disable maintain an enable_count, clk_prepare and clk_unprepare
> also maintain a prepare_count. These APIs will do prepare/enable when the first
> user calling these APIs, and do disable/unprepare when the corresponding counter
> reach 0. Thus We don't need to maintain a clk_enabled counter here.

The original intention is to keep a paired clk enable counter no matter
how the user calls pwm_enable()/pwm_disable() in pair or not, if that's
no longer the case.

>
> Signed-off-by: Axel Lin <axel.lin@xxxxxxxxxx>
> ---
>  drivers/pwm/pwm-pxa.c |   16 ++--------------
>  1 file changed, 2 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c
> index 20370e6..b789882 100644
> --- a/drivers/pwm/pwm-pxa.c
> +++ b/drivers/pwm/pwm-pxa.c
> @@ -48,7 +48,6 @@ struct pxa_pwm_chip {
>         struct device   *dev;
>
>         struct clk      *clk;
> -       int             clk_enabled;
>         void __iomem    *mmio_base;
>  };
>
> @@ -108,24 +107,15 @@ static int pxa_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
>  static int pxa_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
>  {
>         struct pxa_pwm_chip *pc = to_pxa_pwm_chip(chip);
> -       int rc = 0;
>
> -       if (!pc->clk_enabled) {
> -               rc = clk_prepare_enable(pc->clk);
> -               if (!rc)
> -                       pc->clk_enabled++;
> -       }
> -       return rc;
> +       return clk_prepare_enable(pc->clk);
>  }
>
>  static void pxa_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
>  {
>         struct pxa_pwm_chip *pc = to_pxa_pwm_chip(chip);
>
> -       if (pc->clk_enabled) {
> -               clk_disable_unprepare(pc->clk);
> -               pc->clk_enabled--;
> -       }
> +       clk_disable_unprepare(pc->clk);
>  }
>
>  static struct pwm_ops pxa_pwm_ops = {
> @@ -152,8 +142,6 @@ static int pwm_probe(struct platform_device *pdev)
>         if (IS_ERR(pwm->clk))
>                 return PTR_ERR(pwm->clk);
>
> -       pwm->clk_enabled = 0;
> -
>         pwm->chip.dev = &pdev->dev;
>         pwm->chip.ops = &pxa_pwm_ops;
>         pwm->chip.base = -1;
> --
> 1.7.10.4
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/