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

Roxana Nicolescu roxana.nicolescu at canonical.com
Tue Oct 17 08:27:22 UTC 2023


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 at 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




More information about the kernel-team mailing list