diff options
| author | Dawei Li <[email protected]> | 2022-11-13 16:26:09 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2022-11-23 18:11:22 +0000 |
| commit | 6c0eb5ba3500f6da367351ff3c4452c029cb72fa (patch) | |
| tree | 86103c591d5e81a20ffb8d651d8676f81390f21f /drivers/platform/x86/intel/rst.c | |
| parent | ACPI: bus: Fix the _OSC capability check for FFH OpRegion (diff) | |
| download | kernel-6c0eb5ba3500f6da367351ff3c4452c029cb72fa.tar.gz kernel-6c0eb5ba3500f6da367351ff3c4452c029cb72fa.zip | |
ACPI: make remove callback of ACPI driver void
For bus-based driver, device removal is implemented as:
1 device_remove()->
2 bus->remove()->
3 driver->remove()
Driver core needs no inform from callee(bus driver) about the
result of remove callback. In that case, commit fc7a6209d571
("bus: Make remove callback return void") forces bus_type::remove
be void-returned.
Now we have the situation that both 1 & 2 of calling chain are
void-returned, so it does not make much sense for 3(driver->remove)
to return non-void to its caller.
So the basic idea behind this change is making remove() callback of
any bus-based driver to be void-returned.
This change, for itself, is for device drivers based on acpi-bus.
Acked-by: Uwe Kleine-König <[email protected]>
Acked-by: Lee Jones <[email protected]>
Acked-by: Dmitry Torokhov <[email protected]>
Reviewed-by: Hans de Goede <[email protected]>
Signed-off-by: Dawei Li <[email protected]>
Reviewed-by: Maximilian Luz <[email protected]> # for drivers/platform/surface/*
Signed-off-by: Rafael J. Wysocki <[email protected]>
Diffstat (limited to 'drivers/platform/x86/intel/rst.c')
| -rw-r--r-- | drivers/platform/x86/intel/rst.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/platform/x86/intel/rst.c b/drivers/platform/x86/intel/rst.c index 3b81cb896fed..35814a7707af 100644 --- a/drivers/platform/x86/intel/rst.c +++ b/drivers/platform/x86/intel/rst.c @@ -113,12 +113,10 @@ static int irst_add(struct acpi_device *acpi) return error; } -static int irst_remove(struct acpi_device *acpi) +static void irst_remove(struct acpi_device *acpi) { device_remove_file(&acpi->dev, &irst_wakeup_attr); device_remove_file(&acpi->dev, &irst_timeout_attr); - - return 0; } static const struct acpi_device_id irst_ids[] = { |
