Commit c4d19838 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

ACPI: glue: Drop cleanup callback from struct acpi_bus_type

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: default avatarFerry Toth <fntoth@gmail.com>
parent 47954481
...@@ -337,16 +337,10 @@ void acpi_device_notify_remove(struct device *dev) ...@@ -337,16 +337,10 @@ void acpi_device_notify_remove(struct device *dev)
if (!adev) if (!adev)
return; return;
if (dev_is_pci(dev)) { if (dev_is_pci(dev))
pci_acpi_cleanup(dev, adev); 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) else if (adev->handler && adev->handler->unbind)
adev->handler->unbind(dev); adev->handler->unbind(dev);
}
acpi_unbind_one(dev); acpi_unbind_one(dev);
} }
...@@ -570,7 +570,6 @@ struct acpi_bus_type { ...@@ -570,7 +570,6 @@ struct acpi_bus_type {
bool (*match)(struct device *dev); bool (*match)(struct device *dev);
struct acpi_device * (*find_companion)(struct device *); struct acpi_device * (*find_companion)(struct device *);
void (*setup)(struct device *); void (*setup)(struct device *);
void (*cleanup)(struct device *);
}; };
int register_acpi_bus_type(struct acpi_bus_type *); int register_acpi_bus_type(struct acpi_bus_type *);
int unregister_acpi_bus_type(struct acpi_bus_type *); int unregister_acpi_bus_type(struct acpi_bus_type *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment