Commit b83afb7e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: battery: Drop redundant checks from acpi_battery_remove() 



In acpi_battery_remove(), "battery" cannot be NULL because it is the
driver data of the platform device passed to that function and it has
been set by acpi_battery_probe(), so drop the redundant check of it
against NULL.

Moreover, getting the ACPI device pointer from battery->device is
slightly less overhead than using the ACPI_COMPANION() macro on the
platform device to retrieve it, so do that and drop the check of that
pointer against NULL which is also redundant.

No intentional functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/12836976.O9o76ZdvQC@rafael.j.wysocki
parent abbdf22e

drivers/acpi/battery.c

+1 −5
Original line number Diff line number Diff line
@@ -1271,13 +1271,9 @@ static int acpi_battery_probe(struct platform_device *pdev) 


static void acpi_battery_remove(struct platform_device *pdev)

{

	struct acpi_device *device = ACPI_COMPANION(&pdev->dev);

	struct acpi_battery *battery = platform_get_drvdata(pdev);



	if (!device || !battery)

		return;



	acpi_dev_remove_notify_handler(device, ACPI_ALL_NOTIFY,

	acpi_dev_remove_notify_handler(battery->device, ACPI_ALL_NOTIFY,

				       acpi_battery_notify);



	device_init_wakeup(&pdev->dev, false);