diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2022-06-18 13:23:10 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-06-30 14:11:21 +0200 |
| commit | e5ed878ddb7cd95cd7886a0298fcb080eeab5e90 (patch) | |
| tree | eb6aa41a272535057ec9964102666d3ebb94c1e0 /drivers/acpi/bus.c | |
| parent | Merge tag 'ib-mfd-acpi-for-rafael-v5.20' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | linux-e5ed878ddb7cd95cd7886a0298fcb080eeab5e90.tar.xz linux-e5ed878ddb7cd95cd7886a0298fcb080eeab5e90.zip | |
ACPI: bus: Drop redundant check in acpi_device_remove()
A bus remove callback is only ever called by the device core with a
bound driver. So there is no need to check if the driver is non-NULL.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
[ rjw: Added empty code line after if () ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 4d7c51a33b01..479eec8a1ec6 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -1062,12 +1062,12 @@ static void acpi_device_remove(struct device *dev) struct acpi_device *acpi_dev = to_acpi_device(dev); struct acpi_driver *acpi_drv = acpi_dev->driver; - if (acpi_drv) { - if (acpi_drv->ops.notify) - acpi_device_remove_notify_handler(acpi_dev); - if (acpi_drv->ops.remove) - acpi_drv->ops.remove(acpi_dev); - } + if (acpi_drv->ops.notify) + acpi_device_remove_notify_handler(acpi_dev); + + if (acpi_drv->ops.remove) + acpi_drv->ops.remove(acpi_dev); + acpi_dev->driver = NULL; acpi_dev->driver_data = NULL; |