Skip to content

Commit

Permalink
pwm: imx27: Simplify helper function to enable and disable clocks
Browse files Browse the repository at this point in the history
pwm_imx27_clk_prepare_enable() took a pointer to a struct pwm_chip just
to convert it to a struct pwm_imx27_chip pointer while all callers
already have the latter. Ditto for pwm_imx27_clk_disable_unprepare().

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
  • Loading branch information
Uwe Kleine-König authored and Thierry Reding committed Mar 30, 2020
1 parent 15d4dbd commit aad4e53
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions drivers/pwm/pwm-imx27.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,8 @@ struct pwm_imx27_chip {

#define to_pwm_imx27_chip(chip) container_of(chip, struct pwm_imx27_chip, chip)

static int pwm_imx27_clk_prepare_enable(struct pwm_chip *chip)
static int pwm_imx27_clk_prepare_enable(struct pwm_imx27_chip *imx)
{
struct pwm_imx27_chip *imx = to_pwm_imx27_chip(chip);
int ret;

ret = clk_prepare_enable(imx->clk_ipg);
Expand All @@ -114,10 +113,8 @@ static int pwm_imx27_clk_prepare_enable(struct pwm_chip *chip)
return 0;
}

static void pwm_imx27_clk_disable_unprepare(struct pwm_chip *chip)
static void pwm_imx27_clk_disable_unprepare(struct pwm_imx27_chip *imx)
{
struct pwm_imx27_chip *imx = to_pwm_imx27_chip(chip);

clk_disable_unprepare(imx->clk_per);
clk_disable_unprepare(imx->clk_ipg);
}
Expand All @@ -130,7 +127,7 @@ static void pwm_imx27_get_state(struct pwm_chip *chip,
u64 tmp;
int ret;

ret = pwm_imx27_clk_prepare_enable(chip);
ret = pwm_imx27_clk_prepare_enable(imx);
if (ret < 0)
return;

Expand Down Expand Up @@ -175,7 +172,7 @@ static void pwm_imx27_get_state(struct pwm_chip *chip,
state->duty_cycle = DIV_ROUND_CLOSEST_ULL(tmp, pwm_clk);

if (!state->enabled)
pwm_imx27_clk_disable_unprepare(chip);
pwm_imx27_clk_disable_unprepare(imx);
}

static void pwm_imx27_sw_reset(struct pwm_chip *chip)
Expand Down Expand Up @@ -259,7 +256,7 @@ static int pwm_imx27_apply(struct pwm_chip *chip, struct pwm_device *pwm,
if (cstate.enabled) {
pwm_imx27_wait_fifo_slot(chip, pwm);
} else {
ret = pwm_imx27_clk_prepare_enable(chip);
ret = pwm_imx27_clk_prepare_enable(imx);
if (ret)
return ret;

Expand Down Expand Up @@ -290,7 +287,7 @@ static int pwm_imx27_apply(struct pwm_chip *chip, struct pwm_device *pwm,
writel(cr, imx->mmio_base + MX3_PWMCR);

if (!state->enabled)
pwm_imx27_clk_disable_unprepare(chip);
pwm_imx27_clk_disable_unprepare(imx);

return 0;
}
Expand Down Expand Up @@ -361,7 +358,7 @@ static int pwm_imx27_remove(struct platform_device *pdev)

imx = platform_get_drvdata(pdev);

pwm_imx27_clk_disable_unprepare(&imx->chip);
pwm_imx27_clk_disable_unprepare(imx);

return pwmchip_remove(&imx->chip);
}
Expand Down

0 comments on commit aad4e53

Please sign in to comment.