iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ACPI: glue: Drop cleanup callback from struct acpi_bus_type

Browse Source 
Since PCI was the only user of the ->cleanup callback in struct
acpi_bus_type and it is not using struct acpi_bus_type any more,
drop that callback from there and update acpi_device_notify_remove()
accordingly.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Ferry Toth <fntoth@gmail.com>
This commit is contained in:
Rafael J. Wysocki 2021-09-18 14:56:17 +02:00
parent 4795448117
commit c4d19838d8
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/acpi/glue.c
View File

@ -337,16 +337,10 @@ void acpi_device_notify_remove(struct device *dev)
if (!adev)
return;
if (dev_is_pci(dev)) {
if (dev_is_pci(dev))
pci_acpi_cleanup(dev, adev);
} else {
struct acpi_bus_type *type = acpi_get_bus_type(dev);
if (type && type->cleanup)
type->cleanup(dev);
else if (adev->handler && adev->handler->unbind)
adev->handler->unbind(dev);
}
else if (adev->handler && adev->handler->unbind)
adev->handler->unbind(dev);
acpi_unbind_one(dev);
}

1
include/acpi/acpi_bus.h
View File

@ -570,7 +570,6 @@ struct acpi_bus_type {
bool (*match)(struct device *dev);
struct acpi_device * (*find_companion)(struct device *);
void (*setup)(struct device *);
void (*cleanup)(struct device *);
};
int register_acpi_bus_type(struct acpi_bus_type *);
int unregister_acpi_bus_type(struct acpi_bus_type *);