merged.
Bruce
In message: [linux-yocto][v6.1/standard/nxp-sdk-6.1/nxp-soc &
v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc][PATCH] pwm: adp5585: Add return
value to pwm_adp5585_get_state()
on 05/03/2024 Xiaolei Wang wrote:
> commit 547cc8dae247 ("pwm: Make .get_state() callback return an error code")
> has added a return value to get_state(), so modify and add a return value
> to avoid build errors.
>
> error: initialization of 'int (*)(struct pwm_chip *, struct pwm_device *,
> struct pwm_state *)' from incompatible pointer type 'void (*)(struct pwm_chip
> *, struct pwm_device *, struct pwm_state *)' [-Werror=
> incompatible-pointer-types]
> 170 | .get_state = pwm_adp5585_get_state,
> E
> | ^~~~~~~~~~~~~~~~~~~~~
>
> Fixes: 547cc8dae247 ("pwm: Make .get_state() callback return an error code")
> Signed-off-by: Xiaolei Wang <[email protected]>
> ---
> drivers/pwm/pwm-adp5585.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pwm/pwm-adp5585.c b/drivers/pwm/pwm-adp5585.c
> index 3396f363d06a..b1c3eb51de7f 100644
> --- a/drivers/pwm/pwm-adp5585.c
> +++ b/drivers/pwm/pwm-adp5585.c
> @@ -49,7 +49,7 @@ static int adp5585_pwm_reg_write(struct adp5585_pwm_chip
> *adp5585_pwm, u8 reg, u
> return adp5585->write_reg(adp5585, reg, val);
> }
>
> -static void pwm_adp5585_get_state(struct pwm_chip *chip,
> +static int pwm_adp5585_get_state(struct pwm_chip *chip,
> struct pwm_device *pwm,
> struct pwm_state *state)
> {
> @@ -77,6 +77,7 @@ static void pwm_adp5585_get_state(struct pwm_chip *chip,
> /* get channel status */
> adp5585_pwm_reg_read(adp5585_pwm, ADP5585_PWM_CFG, &temp);
> state->enabled = temp & ADP5585_PWM_CFG_EN;
> + return 0;
> }
>
> static int pwm_adp5585_apply(struct pwm_chip *chip,
> --
> 2.25.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13642):
https://lists.yoctoproject.org/g/linux-yocto/message/13642
Mute This Topic: https://lists.yoctoproject.org/mt/104737840/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
