| Message ID | 20240927092449.44628-1-sergio.paracuellos@gmail.com |
|---|---|
| State | Accepted |
| Commit | 43d6961cdf1d0621c55638ed33554027978ae1fe |
| Headers | show |
| Series | PCI: acpiphp_ampere_altra: Switch back to struct platform_driver::remove() | expand |
On Fri, Sep 27, 2024 at 11:24:49AM +0200, Sergio Paracuellos wrote: > After commit 0edb555a65d1 ("platform: Make platform_driver::remove() > return void") .remove() is (again) the right callback to implement for > platform drivers. > > Convert all PCI controller drivers to use .remove(), with the eventual goal > to drop struct platform_driver::remove_new(). As .remove() and .remove_new() > have the same prototypes, conversion is done by just changing the structure > member name in the driver initializer. > > Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com> Applied to pci/driver-remove for v6.13, thanks. I also moved the controller patch to this branch so they're all together. > --- > drivers/pci/hotplug/acpiphp_ampere_altra.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > Hi Bjorn, > > This is the last 'remove_new' inside 'drivers/pci' folder. Since it is > not in controller I preferred to sent this patch alone. > > Thanks, > Sergio Paracuellos > > diff --git a/drivers/pci/hotplug/acpiphp_ampere_altra.c b/drivers/pci/hotplug/acpiphp_ampere_altra.c > index f5c9e741c1d4..70dbc0431fc6 100644 > --- a/drivers/pci/hotplug/acpiphp_ampere_altra.c > +++ b/drivers/pci/hotplug/acpiphp_ampere_altra.c > @@ -119,7 +119,7 @@ static struct platform_driver altra_led_driver = { > .acpi_match_table = altra_led_ids, > }, > .probe = altra_led_probe, > - .remove_new = altra_led_remove, > + .remove = altra_led_remove, > }; > module_platform_driver(altra_led_driver); > > -- > 2.25.1 >
diff --git a/drivers/pci/hotplug/acpiphp_ampere_altra.c b/drivers/pci/hotplug/acpiphp_ampere_altra.c index f5c9e741c1d4..70dbc0431fc6 100644 --- a/drivers/pci/hotplug/acpiphp_ampere_altra.c +++ b/drivers/pci/hotplug/acpiphp_ampere_altra.c @@ -119,7 +119,7 @@ static struct platform_driver altra_led_driver = { .acpi_match_table = altra_led_ids, }, .probe = altra_led_probe, - .remove_new = altra_led_remove, + .remove = altra_led_remove, }; module_platform_driver(altra_led_driver);
After commit 0edb555a65d1 ("platform: Make platform_driver::remove() return void") .remove() is (again) the right callback to implement for platform drivers. Convert all PCI controller drivers to use .remove(), with the eventual goal to drop struct platform_driver::remove_new(). As .remove() and .remove_new() have the same prototypes, conversion is done by just changing the structure member name in the driver initializer. Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com> --- drivers/pci/hotplug/acpiphp_ampere_altra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Hi Bjorn, This is the last 'remove_new' inside 'drivers/pci' folder. Since it is not in controller I preferred to sent this patch alone. Thanks, Sergio Paracuellos