diff mbox series

[SRU,Lunar,linux,linux-kvm,[PATCH,1/1] Revert "pwm: Add a stub for devm_pwmchip_add()"

Message ID 20231017082722.15380-2-roxana.nicolescu@canonical.com
State New
Headers show
Series Remove duplication of devm_pwmchip_add function definition | expand

Commit Message

Roxana Nicolescu Oct. 17, 2023, 8:27 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/2039542

This reverts commit aff2a1959118375955959f27b5a245e90570d2f3.

This was applied twice unnintentionally causing a build failure due to
the same function `devm_pwmchip_add` being defined. It was caught only on
linux-kvm because these stub functions are under CONFIG_PWM=n.

Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
---
 include/linux/pwm.h | 5 -----
 1 file changed, 5 deletions(-)

Comments

Marcelo Henrique Cerri Oct. 17, 2023, 11:36 a.m. UTC | #1
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512


On Tue, Oct 17 2023, Roxana Nicolescu wrote:
> BugLink: https://bugs.launchpad.net/bugs/2039542
>
> This reverts commit aff2a1959118375955959f27b5a245e90570d2f3.
>
> This was applied twice unnintentionally causing a build failure due to
> the same function `devm_pwmchip_add` being defined. It was caught only on
> linux-kvm because these stub functions are under CONFIG_PWM=n.
>
> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
> ---
>  include/linux/pwm.h | 5 -----
>  1 file changed, 5 deletions(-)
>
> diff --git a/include/linux/pwm.h b/include/linux/pwm.h
> index faca8e2bb1b3..161e91167b9c 100644
> --- a/include/linux/pwm.h
> +++ b/include/linux/pwm.h
> @@ -483,11 +483,6 @@ static inline int devm_pwmchip_add(struct device *dev, struct pwm_chip *chip)
>  	return -EINVAL;
>  }
>
> -static inline int devm_pwmchip_add(struct device *dev, struct pwm_chip *chip)
> -{
> -	return -EINVAL;
> -}
> -
>  static inline struct pwm_device *pwm_request_from_chip(struct pwm_chip *chip,
>  						       unsigned int index,
>  						       const char *label)
> --
> 2.34.1

LGTM

Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>

- --
Regards,
Marcelo
-----BEGIN PGP SIGNATURE-----

iQHQBAEBCgA6FiEExJjLjAfVL0XbfEr56e82LoessAkFAmUucdwcHG1hcmNlbG8u
Y2VycmlAY2Fub25pY2FsLmNvbQAKCRDp7zYuh6ywCTCvDACRzmE6orFih879XmvG
uPCZIC0kleAi/wvWRicilPuJ+NXrS6+tJJKW05tI/zGnYvyPGd5QZVR65g+7U6aB
+2+KNAcD4ygU2jzDIBi8IJQK4NtcgKaTPw5wsf6JMzgPHUvLn4zYq2yXE7WMSYNr
+dlCDg3FUYd95zdp0yeEnW47nz+zHAAXYalUEQ9AN6REdDEFnwz52ylGf6s0ndW4
zLaqPboszjofvullqilI/S0/Drc41JVAIEdC9mtlIdJKYggYfTwyRj5D2wftu2rb
ter2drZsXz6oW5r1kLMG7ppLfuAwzy0DjNAFNuCxZyZw9L/Alay9CM741d/eNYpw
NG6b4iIDUauUVL8sKC4KudAaEQYZlVgxJrQMipeLh+gzhfzZfSKkELhELjvIibxp
qOxx7kjBIMpdsmMykALugsWMpVqnEntlsvHK7cscfgRgYZKlnMj+05Ml2H/09A/+
v5S+h7G8SOgR1807pP5QG22PGVISXW3FXK53xkVpIIZBih4=
=bKPt
-----END PGP SIGNATURE-----
diff mbox series

Patch

diff --git a/include/linux/pwm.h b/include/linux/pwm.h
index faca8e2bb1b3..161e91167b9c 100644
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@ -483,11 +483,6 @@  static inline int devm_pwmchip_add(struct device *dev, struct pwm_chip *chip)
 	return -EINVAL;
 }
 
-static inline int devm_pwmchip_add(struct device *dev, struct pwm_chip *chip)
-{
-	return -EINVAL;
-}
-
 static inline struct pwm_device *pwm_request_from_chip(struct pwm_chip *chip,
 						       unsigned int index,
 						       const char *label)