Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ae4671a authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

pwm: meson: Simplify duplicated per-channel tracking 



[ Upstream commit 5f97f18feac9bd5a8163b108aee52d783114b36f ]

The driver tracks per-channel data via struct pwm_device::chip_data and
struct meson_pwm::channels[]. The latter holds the actual data, the former
is only a pointer to the latter. So simplify by using struct
meson_pwm::channels[] consistently.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
Stable-dep-of: 87a2cbf02d77 ("pwm: meson: fix handling of period/duty if greater than UINT_MAX")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8abacc57

drivers/pwm/pwm-meson.c

+6 −5
Original line number Diff line number Diff line
@@ -147,12 +147,13 @@ static int meson_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm) 
		return err;

	}



	return pwm_set_chip_data(pwm, channel);

	return 0;

}



static void meson_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)

{

	struct meson_pwm_channel *channel = pwm_get_chip_data(pwm);

	struct meson_pwm *meson = to_meson_pwm(chip);

	struct meson_pwm_channel *channel = &meson->channels[pwm->hwpwm];



	if (channel)

		clk_disable_unprepare(channel->clk);
@@ -161,7 +162,7 @@ static void meson_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm) 
static int meson_pwm_calc(struct meson_pwm *meson, struct pwm_device *pwm,

			  const struct pwm_state *state)

{

	struct meson_pwm_channel *channel = pwm_get_chip_data(pwm);

	struct meson_pwm_channel *channel = &meson->channels[pwm->hwpwm];

	unsigned int duty, period, pre_div, cnt, duty_cnt;

	unsigned long fin_freq;
@@ -230,7 +231,7 @@ static int meson_pwm_calc(struct meson_pwm *meson, struct pwm_device *pwm, 


static void meson_pwm_enable(struct meson_pwm *meson, struct pwm_device *pwm)

{

	struct meson_pwm_channel *channel = pwm_get_chip_data(pwm);

	struct meson_pwm_channel *channel = &meson->channels[pwm->hwpwm];

	struct meson_pwm_channel_data *channel_data;

	unsigned long flags;

	u32 value;
@@ -273,8 +274,8 @@ static void meson_pwm_disable(struct meson_pwm *meson, struct pwm_device *pwm) 
static int meson_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,

			   const struct pwm_state *state)

{

	struct meson_pwm_channel *channel = pwm_get_chip_data(pwm);

	struct meson_pwm *meson = to_meson_pwm(chip);

	struct meson_pwm_channel *channel = &meson->channels[pwm->hwpwm];

	int err = 0;



	if (!state)