iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pwm: pxa: Remove clk_enabled field from struct pxa_pwm_chip

Browse Source 
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.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
This commit is contained in:
Axel Lin 2013-03-31 23:04:31 +08:00 committed by Thierry Reding
parent 72da70e77f
commit b014a30c59
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/pwm/pwm-pxa.c
View File

@ -48,7 +48,6 @@ struct pxa_pwm_chip {
struct device *dev; struct device *dev;
struct clk *clk; struct clk *clk;
int clk_enabled;
void __iomem *mmio_base; 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) static int pxa_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
{ {
struct pxa_pwm_chip *pc = to_pxa_pwm_chip(chip); struct pxa_pwm_chip *pc = to_pxa_pwm_chip(chip);
int rc = 0;
if (!pc->clk_enabled) { return clk_prepare_enable(pc->clk);
rc = clk_prepare_enable(pc->clk);
if (!rc)
pc->clk_enabled++;
}
return rc;
} }
static void pxa_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) static void pxa_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
{ {
struct pxa_pwm_chip *pc = to_pxa_pwm_chip(chip); struct pxa_pwm_chip *pc = to_pxa_pwm_chip(chip);
if (pc->clk_enabled) { clk_disable_unprepare(pc->clk);
clk_disable_unprepare(pc->clk);
pc->clk_enabled--;
}
} }
static struct pwm_ops pxa_pwm_ops = { static struct pwm_ops pxa_pwm_ops = {
@ -152,8 +142,6 @@ static int pwm_probe(struct platform_device *pdev)
if (IS_ERR(pwm->clk)) if (IS_ERR(pwm->clk))
return PTR_ERR(pwm->clk); return PTR_ERR(pwm->clk);
pwm->clk_enabled = 0;
pwm->chip.dev = &pdev->dev; pwm->chip.dev = &pdev->dev;
pwm->chip.ops = &pxa_pwm_ops; pwm->chip.ops = &pxa_pwm_ops;
pwm->chip.base = -1; pwm->chip.base = -1;