Takashi Iwai 6c69c6
From be0e97526455fefe3b7668b7fdf6cd247bf13318 Mon Sep 17 00:00:00 2001
Takashi Iwai 6c69c6
From: Arnd Bergmann <arnd@arndb.de>
Takashi Iwai 6c69c6
Date: Mon, 26 Oct 2020 22:48:34 +0100
Takashi Iwai 6c69c6
Subject: [PATCH] ACPI: dock: fix enum-conversion warning
Takashi Iwai 6c69c6
Git-commit: be0e97526455fefe3b7668b7fdf6cd247bf13318
Takashi Iwai 6c69c6
Patch-mainline: v5.10-rc2
Takashi Iwai 6c69c6
References: git-fixes
Takashi Iwai 6c69c6
Takashi Iwai 6c69c6
gcc points out a type mismatch:
Takashi Iwai 6c69c6
Takashi Iwai 6c69c6
Drivers/acpi/dock.c: In function 'hot_remove_dock_devices':
Takashi Iwai 6c69c6
drivers/acpi/dock.c:234:53: warning: implicit conversion from 'enum <anonymous>' to 'enum dock_callback_type' [-Wenum-conversion]
Takashi Iwai 6c69c6
  234 |   dock_hotplug_event(dd, ACPI_NOTIFY_EJECT_REQUEST, false);
Takashi Iwai 6c69c6
Takashi Iwai 6c69c6
This is harmless because 'false' still has the correct numeric value,
Takashi Iwai 6c69c6
but passing DOCK_CALL_HANDLER documents better what is going on
Takashi Iwai 6c69c6
and avoids the warning.
Takashi Iwai 6c69c6
Takashi Iwai 6c69c6
Fixes: 37f908778f20 ("ACPI / dock: Walk list in reverse order during removal of devices")
Takashi Iwai 6c69c6
Fixes: f09ce741a03a ("ACPI / dock / PCI: Drop ACPI dock notifier chain")
Takashi Iwai 6c69c6
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Takashi Iwai 6c69c6
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Takashi Iwai 6c69c6
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Takashi Iwai 6c69c6
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 6c69c6
Takashi Iwai 6c69c6
---
Takashi Iwai 6c69c6
 drivers/acpi/dock.c | 3 ++-
Takashi Iwai 6c69c6
 1 file changed, 2 insertions(+), 1 deletion(-)
Takashi Iwai 6c69c6
Takashi Iwai 6c69c6
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
Takashi Iwai 6c69c6
index 45d4b7b69de8..24e076f44d23 100644
Takashi Iwai 6c69c6
--- a/drivers/acpi/dock.c
Takashi Iwai 6c69c6
+++ b/drivers/acpi/dock.c
Takashi Iwai 6c69c6
@@ -231,7 +231,8 @@ static void hot_remove_dock_devices(struct dock_station *ds)
Takashi Iwai 6c69c6
 	 * between them).
Takashi Iwai 6c69c6
 	 */
Takashi Iwai 6c69c6
 	list_for_each_entry_reverse(dd, &ds->dependent_devices, list)
Takashi Iwai 6c69c6
-		dock_hotplug_event(dd, ACPI_NOTIFY_EJECT_REQUEST, false);
Takashi Iwai 6c69c6
+		dock_hotplug_event(dd, ACPI_NOTIFY_EJECT_REQUEST,
Takashi Iwai 6c69c6
+				   DOCK_CALL_HANDLER);
Takashi Iwai 6c69c6
 
Takashi Iwai 6c69c6
 	list_for_each_entry_reverse(dd, &ds->dependent_devices, list)
Takashi Iwai 6c69c6
 		acpi_bus_trim(dd->adev);
Takashi Iwai 6c69c6
-- 
Takashi Iwai 6c69c6
2.16.4
Takashi Iwai 6c69c6