Remove duplication of devm_pwmchip_add function definition

Bug #2039542 reported by Roxana Nicolescu
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
linux (Ubuntu)
Invalid
Undecided
Unassigned
Lunar
Fix Committed
Undecided
Roxana Nicolescu
linux-kvm (Ubuntu)
New
Undecided
Unassigned
Lunar
Fix Committed
Undecided
Roxana Nicolescu

Bug Description

SRU Justification:

[Impact]

* Upstream commit 88da4e8113110d5f4ebdd2f8cd0899e300cd1954 "pwm: Add a stub for devm_pwmchip_add()", was applied the second time during the latest upstream patchset (#LP: 2037005) for cycle 2023.10.02.
* `git am` did not detect that the changes were applied, leading to the same function definition being duplicated.
* This was not caught when the main kernel was built because this code is under CONFIG_PWM=n. The main kernel and pretty much every kernel apart from linux-kvm, has CONFIG_PWM=y.
* The problem was caught when lunar:linux-kvm was cranked and build failed with the following error:

```
In file included from /build/lunar/drivers/acpi/acpi_lpss.c:23:
/build/lunar/include/linux/pwm.h:486:19: error: redefinition of 'devm_pwmchip_add'
  486 | static inline int devm_pwmchip_add(struct device *dev, struct pwm_chip *chip)
      | ^~~~~~~~~~~~~~~~
/build/lunar/include/linux/pwm.h:481:19: note: previous definition of 'devm_pwmchip_add' with type 'int(struct device *, struct pwm_chip *)'
  481 | static inline int devm_pwmchip_add(struct device *dev, struct pwm_chip *chip)
      | ^~~~~~~~~~~~~~~~

```

[Fix]
* Revert the commit.
* Because this affects only linux:kvm, it is necessary to apply this fix for lunar:linux-kvm for cycle 2023.10.02, but the main kernel can wait for the next cycle.

[Test plan]
* Since linux-kvm was the only kernel that had this issue, I applied the patch to kvm after I rebased the latest changes from the parent and did a build test.
* I also did a build test for linux:main just to make sure

[Where problems could occur]
* This change is pretty non-invasive, so nowhere

Tags: sru-20231002
Changed in linux (Ubuntu):
status: New → Invalid
Changed in linux-kvm (Ubuntu Lunar):
status: New → Invalid
Changed in linux (Ubuntu Lunar):
status: New → In Progress
Changed in linux-kvm (Ubuntu Lunar):
status: Invalid → In Progress
Changed in linux (Ubuntu Lunar):
assignee: nobody → Roxana Nicolescu (roxanan)
Changed in linux-kvm (Ubuntu Lunar):
assignee: nobody → Roxana Nicolescu (roxanan)
tags: added: sru-20231002
description: updated
description: updated
Changed in linux (Ubuntu Lunar):
status: In Progress → Fix Committed
Changed in linux-kvm (Ubuntu Lunar):
status: In Progress → Fix Committed
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.